Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop
authorRalph Boehme <sloowfranklin@gmail.com>
Mon, 14 Oct 2013 08:49:05 +0000 (10:49 +0200)
committerRalph Boehme <sloowfranklin@gmail.com>
Mon, 14 Oct 2013 08:49:05 +0000 (10:49 +0200)
1  2 
NEWS
doc/manpages/man5/afp.conf.5.xml
etc/afpd/afp_dsi.c
etc/afpd/auth.c
etc/uams/uams_dhx2_pam.c
include/atalk/globals.h
libatalk/util/netatalk_conf.c
man/man5/afp.conf.5.in

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