Merge remote-tracking branch 'origin/develop' into spotlight

Conflicts:
	VERSION

diff --cc bin/ad/ad_util.c
Simple merge

diff --cc libatalk/Makefile.am
index 4ad799bf7ba38164462b2f4a9bec31e82e84525c,00712ddaa0b3c6214169a964e2321e2d36b95c86..8254e57959f94c3afbcaddc49948ea21d5056757
--- 1/libatalk/Makefile.am
--- 2/libatalk/Makefile.am
+++ b/libatalk/Makefile.am
@@@ -30,8 -30,9 +30,9 @@@ VERSION_INFO = 4:0:
  #   3.0             1:0:0
  #   3.0.1           2:0:0
  #   3.0.2           3:0:0
+ #   3.0.3           4:0:0
  
 -SUBDIRS = acl adouble bstring compat cnid dsi iniparser tdb util unicode vfs
 +SUBDIRS = acl adouble bstring compat cnid dsi iniparser talloc tdb util unicode vfs
  
  lib_LTLIBRARIES = libatalk.la
  

diff --cc macros/netatalk.m4
Simple merge

diff --cc macros/summary.m4
Simple merge