--- a/NEWS	Mon Jun 22 01:43:31 2009 -0400
+++ b/NEWS	Mon Jun 22 01:49:28 2009 -0400
@@ -1,3 +1,17 @@
+v1.2.rc6 2009-06-22 Timo Sirainen <tss@iki.fi>
+
+	* imap proxy: Pass through to client unexpected untagged replies
+	  from remote server (e.g. alerts).
+	* Solr: Don't use "any" copyfield, it doubles the index size.
+	* mail_location: Allow using ":" characters in dir names by escaping
+	  it as "::".
+
+	- mbox: Don't crash with invalid From_-lines.
+	- IMAP: Don't crash if IDLE command is pipelined after a long-running
+	  UID FETCH or UID SEARCH.
+	- ACL / shared mailbox fixes
+	- Some metadata files were incorrectly getting 0666 permissions.
+
 v1.2.rc5 2009-06-04 Timo Sirainen <tss@iki.fi>
 
 	* auth_cache_negative_ttl is now used also for password mismatches