Merge branch 'branch-netatalk-3-1' of netafp.com:git/netatalk into branch-netatalk-3-1

Conflicts:
	NEWS

diff --cc NEWS
index 2f5807d22235f37665eb9f327dd1d49f7018689e,ac8b7d668a6a27d672e79e58bbc186ca01931a2a..eb10cf613100afad1caf475b15c7a2abd70f1bc9
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -6,8 -6,7 +6,9 @@@ Changes in 3.1.
  * FIX: afpd: Unarchiving certain ZIP archives fails, bug #569
  * UPD: Update Unicode support to version 7.0.0
  * FIX: Memory overflow caused by 'basedir regex', bug #567
+ * NEW: afpd: delete empty resource forks, from FR #92
 +* FIX: afpd: fix a crash when accessing ._ AppleDouble files created
 +       by OS X via SMB, bug #564
  
  Changes in 3.1.2
  ================