merge r31318
authorJo-Philipp Wich <[email protected]>
Mon, 16 Apr 2012 19:33:53 +0000 (19:33 +0000)
committerJo-Philipp Wich <[email protected]>
Mon, 16 Apr 2012 19:33:53 +0000 (19:33 +0000)
commit93fe9d9fb5a70792fc38d3c3da98c5bd67082461
treeee1da5bc6a807bd88cfd6bb734c59ef8a5855926
parent6902340134ace62b358d51028b5a5eb2a8a64c58
merge r31318

SVN-Revision: 31320
net/netatalk/Makefile
net/netatalk/files/afpd.init