Merge branch 'next'

author Arne Fitzenreiter <arne_f@ipfire.org>

Wed, 1 Feb 2017 21:36:11 +0000 (22:36 +0100)

committer Arne Fitzenreiter <arne_f@ipfire.org>

Wed, 1 Feb 2017 21:36:11 +0000 (22:36 +0100)
author Arne Fitzenreiter <arne_f@ipfire.org>
Wed, 1 Feb 2017 21:36:11 +0000 (22:36 +0100)
committer Arne Fitzenreiter <arne_f@ipfire.org>
Wed, 1 Feb 2017 21:36:11 +0000 (22:36 +0100)
diff --cc config/rootfiles/oldcore/108/filelists/files
Simple merge
author	Arne Fitzenreiter <arne_f@ipfire.org>
	Wed, 1 Feb 2017 21:36:11 +0000 (22:36 +0100)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Wed, 1 Feb 2017 21:36:11 +0000 (22:36 +0100)