]> arthur.barton.de Git - netatalk.git/commit - etc/afpd/main.c
merge from branch 2-1
authorFrank Lahm <franklahm@googlemail.com>
Tue, 14 Sep 2010 15:41:06 +0000 (17:41 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Tue, 14 Sep 2010 15:41:06 +0000 (17:41 +0200)
commitdcbfd39d8a7df800a55ab0160d890bd61ebc7302
tree7d8aa89adb34cb9b46703a2a9c85fa66cf29d16d
parentba288e1499eb7106d6372ec019256b7d3ea1d2e7
parent68a34905cd2f438423c00206fe99836a75b22971
merge from branch 2-1