Merge branch 'next' into initscripts-cleanup
authorJonatan Schlag <jonatan.schlag@ipfire.org>
Fri, 3 Mar 2017 13:56:35 +0000 (14:56 +0100)
committerJonatan Schlag <jonatan.schlag@ipfire.org>
Fri, 3 Mar 2017 13:56:35 +0000 (14:56 +0100)
commit17f7f41e4147c5653591c1413e576d72461cc1cb
treee6ebf90c618d1f379d84074e0cf6380683764925
parent7d9b033b79af8124853a0aac6992389ea8595172
parent5021ee33de34ca1cfb4747c9741f7ac6bd08f9e7
Merge branch 'next' into initscripts-cleanup
lfs/cups
src/initscripts/system/unbound