]> arthur.barton.de Git - netatalk.git/commit
Fix merge error
authorFrank Lahm <franklahm@googlemail.com>
Sun, 24 Apr 2011 13:40:05 +0000 (15:40 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Sun, 24 Apr 2011 13:40:05 +0000 (15:40 +0200)
commitb4d826a5afed64e9a97a106fbc0bbc9c0d8c3b49
tree324a15d60725c79c2157ab62045ca410818deb31
parentdd07aea71f86aa97f05db188c49e0a3c035ee41c
Fix merge error
etc/afpd/file.c