Merge branch 'next' into initscripts-cleanup
authorJonatan Schlag <jonatan.schlag@ipfire.org>
Sat, 25 Feb 2017 11:58:27 +0000 (12:58 +0100)
committerJonatan Schlag <jonatan.schlag@ipfire.org>
Sat, 25 Feb 2017 11:58:27 +0000 (12:58 +0100)
1  2 
lfs/cups

diff --cc lfs/cups
Simple merge