]> arthur.barton.de Git - netatalk.git/commitdiff
Merge master
authorFrank Lahm <franklahm@googlemail.com>
Sat, 8 Jan 2011 09:18:42 +0000 (10:18 +0100)
committerFrank Lahm <franklahm@googlemail.com>
Sat, 8 Jan 2011 09:18:42 +0000 (10:18 +0100)
1  2 
etc/afpd/afp_options.c

Simple merge