Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop
authorRalph Boehme <sloowfranklin@gmail.com>
Tue, 14 May 2013 12:32:33 +0000 (14:32 +0200)
committerRalph Boehme <sloowfranklin@gmail.com>
Tue, 14 May 2013 12:32:33 +0000 (14:32 +0200)
1  2 
NEWS
configure.ac
include/atalk/globals.h
libatalk/util/netatalk_conf.c
macros/netatalk.m4

diff --cc NEWS
Simple merge
diff --cc configure.ac
Simple merge
Simple merge
Simple merge
Simple merge