]> arthur.barton.de Git - netatalk.git/commitdiff
projects / netatalk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 4021b76)
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)
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


No differences found
Alex' Netatalk development repository