]> arthur.barton.de Git - netatalk.git/commitdiff
merge branch-2-1
authorFrank Lahm <franklahm@googlemail.com>
Fri, 24 Sep 2010 08:27:37 +0000 (10:27 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Fri, 24 Sep 2010 08:27:37 +0000 (10:27 +0200)
1  2 
etc/afpd/afp_config.c
etc/afpd/auth.c

Simple merge
diff --cc etc/afpd/auth.c
Simple merge