Arne Fitzenreiter 802b916d10 Merge remote-tracking branch 'origin/master' into next ...

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

Conflicts:
	make.sh

2016-02-17 19:47:50 +01:00

..

common

tzdata: Update to 2016a

2016-01-30 16:35:41 +00:00

core/99

Merge remote-tracking branch 'origin/master' into next

2016-02-17 19:47:50 +01:00

oldcore

Merge remote-tracking branch 'origin/master' into next

2016-02-17 19:47:50 +01:00

packages

nano: Update to 2.5.1

2016-01-17 18:52:09 +00:00