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

author Ralph Boehme <sloowfranklin@gmail.com>

Tue, 14 May 2013 08:48:58 +0000 (10:48 +0200)

committer Ralph Boehme <sloowfranklin@gmail.com>

Tue, 14 May 2013 08:48:58 +0000 (10:48 +0200)
author Ralph Boehme <sloowfranklin@gmail.com>
Tue, 14 May 2013 08:48:58 +0000 (10:48 +0200)
committer Ralph Boehme <sloowfranklin@gmail.com>
Tue, 14 May 2013 08:48:58 +0000 (10:48 +0200)
diff --cc configure.ac
Simple merge
diff --cc macros/netatalk.m4
Simple merge
diff --cc macros/summary.m4
Simple merge
author	Ralph Boehme <sloowfranklin@gmail.com>
	Tue, 14 May 2013 08:48:58 +0000 (10:48 +0200)
committer	Ralph Boehme <sloowfranklin@gmail.com>
	Tue, 14 May 2013 08:48:58 +0000 (10:48 +0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
macros/netatalk.m4	patch \|	diff1 \|	diff2 \|	blob \| history
macros/summary.m4	patch \|	diff1 \|	diff2 \|	blob \| history