]> arthur.barton.de Git - netatalk.git/commit
Fix merge error
authorFrank Lahm <franklahm@googlemail.com>
Sat, 18 Aug 2012 06:05:02 +0000 (08:05 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Sat, 18 Aug 2012 06:05:02 +0000 (08:05 +0200)
commit1a0e659df8e92fce1a34cc1f9eecbf936fb09694
tree66c2551246cf85fd8a7dd87878d6e23d8c68557c
parentd2968df026cd9971caeab102f9348152b08b9132
Fix merge error
etc/afpd/afp_dsi.c