From 2a423095abee2b6d3e73b280a84500a591c9b8e7 Mon Sep 17 00:00:00 2001
From: Gil Forcada <gforcada@gnome.org>
Date: Wed, 25 Feb 2015 21:45:54 +0100
Subject: [PATCH] Add note on CHANGES.rst

---
 CHANGES.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index b0bbbb8..5b8ca9f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -20,6 +20,10 @@ Changelog
 - Read mail settings from new (Plone 5) registry.
   [timo]
 
+- Remove @property from Conversation.total_comments as @property and
+  Acquisition don't play well together.
+  [gforcada]
+
 
 2.3.3 (2014-10-23)
 ------------------