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

author Ralph Boehme <sloowfranklin@gmail.com>

Tue, 4 Jun 2013 10:38:23 +0000 (12:38 +0200)

committer Ralph Boehme <sloowfranklin@gmail.com>

Tue, 4 Jun 2013 10:38:23 +0000 (12:38 +0200)
author Ralph Boehme <sloowfranklin@gmail.com>
Tue, 4 Jun 2013 10:38:23 +0000 (12:38 +0200)
committer Ralph Boehme <sloowfranklin@gmail.com>
Tue, 4 Jun 2013 10:38:23 +0000 (12:38 +0200)
diff --cc NEWS

index 1cfeab2d9080a9f0ec5b44fc6c87c7ac0d939167,debe57ae8d080bc7c27215049905fea0d8270571..7adbb30d88b27081cf3cd8439583bc30363aff06
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,8 -1,6 +1,11 @@@
+ +Changes in 3.1.0
+ +================
+ +* UPD: Add configure option --with-afpstats for overriding the
+ +       result of autodetecting dbus-glib presence
+ +
+ Changes in 3.0.5
+ ================
+ 
   Changes in 3.0.4
   ================
   * FIX: Opening files without metadata EA may result in an invalid
diff --cc configure.ac
Simple merge
diff --cc include/atalk/dsi.h
Simple merge
diff --cc macros/netatalk.m4
Simple merge
diff --cc macros/summary.m4
Simple merge
author	Ralph Boehme <sloowfranklin@gmail.com>
	Tue, 4 Jun 2013 10:38:23 +0000 (12:38 +0200)
committer	Ralph Boehme <sloowfranklin@gmail.com>
	Tue, 4 Jun 2013 10:38:23 +0000 (12:38 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
include/atalk/dsi.h	patch \|	diff1 \|	diff2 \|	blob \| history
macros/netatalk.m4	patch \|	diff1 \|	diff2 \|	blob \| history
macros/summary.m4	patch \|	diff1 \|	diff2 \|	blob \| history