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

author Arne Fitzenreiter <arne_f@ipfire.org>

Fri, 29 Jun 2018 15:07:39 +0000 (17:07 +0200)

committer Arne Fitzenreiter <arne_f@ipfire.org>

Fri, 29 Jun 2018 15:07:39 +0000 (17:07 +0200)
author Arne Fitzenreiter <arne_f@ipfire.org>
Fri, 29 Jun 2018 15:07:39 +0000 (17:07 +0200)
committer Arne Fitzenreiter <arne_f@ipfire.org>
Fri, 29 Jun 2018 15:07:39 +0000 (17:07 +0200)
diff --cc config/rootfiles/core/122/filelists/files
Simple merge
author	Arne Fitzenreiter <arne_f@ipfire.org>
	Fri, 29 Jun 2018 15:07:39 +0000 (17:07 +0200)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Fri, 29 Jun 2018 15:07:39 +0000 (17:07 +0200)