Merge branch 'next' into initscripts-cleanup

author Jonatan Schlag <jonatan.schlag@ipfire.org>

Fri, 3 Mar 2017 13:56:35 +0000 (14:56 +0100)

committer Jonatan Schlag <jonatan.schlag@ipfire.org>

Fri, 3 Mar 2017 13:56:35 +0000 (14:56 +0100)
author Jonatan Schlag <jonatan.schlag@ipfire.org>
Fri, 3 Mar 2017 13:56:35 +0000 (14:56 +0100)
committer Jonatan Schlag <jonatan.schlag@ipfire.org>
Fri, 3 Mar 2017 13:56:35 +0000 (14:56 +0100)
diff --cc lfs/cups
Simple merge
diff --cc src/initscripts/system/unbound
Simple merge
author	Jonatan Schlag <jonatan.schlag@ipfire.org>
	Fri, 3 Mar 2017 13:56:35 +0000 (14:56 +0100)
committer	Jonatan Schlag <jonatan.schlag@ipfire.org>
	Fri, 3 Mar 2017 13:56:35 +0000 (14:56 +0100)
		1	2
lfs/cups	patch \|	diff1 \|	diff2 \|	blob \| history
src/initscripts/system/unbound	patch \|	diff1 \|	diff2 \|	blob \| history