cups: merge r28910
authorJo-Philipp Wich <[email protected]>
Sun, 5 Feb 2012 15:06:44 +0000 (15:06 +0000)
committerJo-Philipp Wich <[email protected]>
Sun, 5 Feb 2012 15:06:44 +0000 (15:06 +0000)
commitfbbddfadb5ce4704f04f07fa1f6fafb3f74fdf32
tree149d603b8621ed1c93bf0b49439de6f09e279461
parentdb200846a16d6f9b7a682d497eb09774f3e393cb
cups: merge r28910

SVN-Revision: 30200
net/cups/Makefile
net/cups/files/cupsd.init