From: Ralph Boehme <rb@sernet.de>
Date: Wed, 18 Jun 2014 15:00:36 +0000 (+0200)
Subject: Merge branch 'branch-netatalk-3-1' of netafp.com:git/netatalk into branch-netatalk-3-1
X-Git-Url: https://arthur.ath.cx/gitweb/?a=commitdiff_plain;h=34bc1896576cd73dcb7fd2605b978c9ed9e4d1ac;p=netatalk.git

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

Conflicts:
	NEWS
---

34bc1896576cd73dcb7fd2605b978c9ed9e4d1ac
diff --cc NEWS
index 2f5807d2,ac8b7d66..eb10cf61
--- a/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
  ================