]> arthur.barton.de Git - netatalk.git/commit - etc/afpd/Makefile.am
Merge remote branch 'remotes/origin/branch-netatalk-2-1'
authorFrank Lahm <franklahm@googlemail.com>
Mon, 17 May 2010 14:41:53 +0000 (16:41 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Mon, 17 May 2010 14:41:53 +0000 (16:41 +0200)
commit3c8f4462f090048c52921392a0d563593491ea5c
tree700e21605146f7f86745a81da3ba76bb0e108576
parente7b3b5a65800bd7a087d0d2f1272b743bd3b0218
parentb3b0183b264b381ee32063ae62118cecd9b8f919
Merge remote branch 'remotes/origin/branch-netatalk-2-1'