Merge branch 'branch-netatalk-3-0' into develop

diff --cc libatalk/Makefile.am
index 8254e57959f94c3afbcaddc49948ea21d5056757,a6df63bd7f3a2fc9e2ec5f1410df2800fb41c5fa..c932076cae5d9f24db8fb5bddf7af6b5aa826c30
--- 1/libatalk/Makefile.am
--- 2/libatalk/Makefile.am
+++ b/libatalk/Makefile.am
@@@ -31,8 -31,9 +31,9 @@@ VERSION_INFO = 5:0:
  #   3.0.1           2:0:0
  #   3.0.2           3:0:0
  #   3.0.3           4:0:0
+ #   3.0.4           5: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