Merge branch 'master' into delete-own-comments

Conflicts:
	CHANGES.rst

CHANGES.rst

@@ -1,13 +1,23 @@
 Changelog
 =========
 
-2.3.3 (unreleased)
+2.3.4 (unreleased)
 ------------------
 
-- Add permission to allow comment authors to delete their own comments if 
+- Add permission to allow comment authors to delete their own comments if
   there are no replies yet.
   [gaudenz]
 
+- Updated portuguese pt-br translation.
+  [jtmolon]
+
+- Read mail settings from new (Plone 5) registry.
+  [timo]
+
+
+2.3.3 (2014-10-23)
+------------------
+
 - Don't execute createReplyForm js if there is no in_reply_to button.
   [vincentfretin]
 
@@ -198,6 +208,7 @@ Changelog
 - Updated Ukrainian translation
   [kroman0]
 
+
 2.2.3 (2013-01-13)
 ------------------
 
@@ -205,6 +216,7 @@ Changelog
   the email field on comment add form when anonymous.
   [toutpt]
 
+
 2.2.2 (2012-11-16)
 ------------------
 
@@ -216,8 +228,8 @@ Changelog
 2.2.1 (2012-11-16)
 ------------------
 
-- Make conversation view not break when comment-id cannot be converted to long.
-  Fixes #13327
+- Make conversation view not break when comment-id cannot be converted to
+  long. This fixes #13327
   [khink]
 
 - fix insufficient privileges when trying to view