Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop

author Ralph Boehme <sloowfranklin@gmail.com>

Tue, 14 May 2013 12:32:33 +0000 (14:32 +0200)

committer Ralph Boehme <sloowfranklin@gmail.com>

Tue, 14 May 2013 12:32:33 +0000 (14:32 +0200)
author Ralph Boehme <sloowfranklin@gmail.com>
Tue, 14 May 2013 12:32:33 +0000 (14:32 +0200)
committer Ralph Boehme <sloowfranklin@gmail.com>
Tue, 14 May 2013 12:32:33 +0000 (14:32 +0200)
diff --cc NEWS
Simple merge
diff --cc configure.ac
Simple merge
diff --cc include/atalk/globals.h
Simple merge
diff --cc libatalk/util/netatalk_conf.c
Simple merge
diff --cc macros/netatalk.m4
Simple merge
author	Ralph Boehme <sloowfranklin@gmail.com>
	Tue, 14 May 2013 12:32:33 +0000 (14:32 +0200)
committer	Ralph Boehme <sloowfranklin@gmail.com>
	Tue, 14 May 2013 12:32:33 +0000 (14:32 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
include/atalk/globals.h	patch \|	diff1 \|	diff2 \|	blob \| history
libatalk/util/netatalk_conf.c	patch \|	diff1 \|	diff2 \|	blob \| history
macros/netatalk.m4	patch \|	diff1 \|	diff2 \|	blob \| history