merge from branch-netatalk-2-1

[netatalk.git] / NEWS

diff --git a/NEWS b/NEWS
index 5d928fdace9e89ef7312c346a5aa5f5d982b3edc..f87c36567799927d26576b99559a97b4325edadd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,8 @@
-Changes in 2.2alpha6? or 2.2beta1?
+Changes in 2.2beta1
 ====================
 
 * FIX: composition of Surrogate Pair
+* FIX: Ubuntu's servername was empty
 
 Changes in 2.2alpha5
 ====================
@@ -62,6 +63,7 @@ Changes in 2.1.6
 ================
 
 * FIX: afpd: Fix for LDAP user cache corruption
+* FIX: gentoo: cannot set $CNID_CONFIG
 
 Changes in 2.1.5
 ================