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)
commit5283818233fe07b1efd52a53b8d894960843629e
tree360fab1155a7c3db6039360de2883ac322334cfa
parent74eaa64e4ba95d94a387e8756d954a1b5b0f9b13
parent3a8b6ae05d4eb722ca67cd4ce393a9e424160100
Merge branch 'next' into initscripts-cleanup
lfs/cups