]> arthur.barton.de Git - netatalk.git/commit - etc/afpd/main.c
Merge branch 'release-3.0-beta1'
authorFrank Lahm <franklahm@googlemail.com>
Tue, 22 May 2012 14:47:21 +0000 (16:47 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Tue, 22 May 2012 14:47:21 +0000 (16:47 +0200)
commit6af4e78e73787e88a88be7f1d3a5e8d44148f9a1
tree399219d97fbb4b1d56d193ac68c40f26fd8a84a1
parent73f8e8731dc225217fb76b140ea958c941262cca
parent4cbf7b17cb60a7acd9101393ea0de2ce8d70cfd5
Merge branch 'release-3.0-beta1'