Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop
authorRalph Boehme <sloowfranklin@gmail.com>
Sun, 15 Sep 2013 15:21:23 +0000 (17:21 +0200)
committerRalph Boehme <sloowfranklin@gmail.com>
Sun, 15 Sep 2013 15:21:23 +0000 (17:21 +0200)
commit4021b76ce3f3e51756e9d59b4a5a045ad6398dc8
tree9315cddb86369955af8ef47a01c33dc95ff7a8eb
parentb85e88cc0e408268df912f6c10607ad72991c21e
parent68796405673cab226c2001208c4c9d216c5f4a09
Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop

Conflicts:
NEWS
VERSION
doc/manpages/man5/afp.conf.5.xml
doc/www/ReleaseNotes
libatalk/util/netatalk_conf.c
macros/summary.m4
man/man5/afp.conf.5.in
12 files changed:
NEWS
bin/ad/ad_util.c
configure.ac
doc/manpages/man5/afp.conf.5.xml
doc/www/ReleaseNotes
etc/afpd/file.c
include/atalk/globals.h
include/atalk/volume.h
libatalk/util/netatalk_conf.c
macros/netatalk.m4
macros/summary.m4
man/man5/afp.conf.5.in