From ab926d6a10b4bc0b71ddcbf87fdd9230e91be68c Mon Sep 17 00:00:00 2001
From: Alin Voinea <alin@eaudeweb.ro>
Date: Thu, 17 Apr 2014 15:29:20 +0300
Subject: [PATCH] Update change log

Conflicts:
	CHANGES.rst
---
 CHANGES.rst                          | 12 +++++++++++-
 plone/app/discussion/contentrules.py |  2 --
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index f3864a5..687bbe0 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,8 +4,11 @@ Changelog
 2.3.3 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Register events as Content Rules Event Types if plone.contentrules is present
+  [avoinea]
 
+- Trigger custom events on comment add/remove/reply
+  [avoinea]
 
 2.3.2 (2014-04-05)
 ------------------
@@ -54,6 +57,13 @@ Changelog
 - Corrections and additions to the Danish translation
   [aputtu]
 
+
+2.2.12 (2014-01-13)
+-------------------
+
+- Show author email to Moderator when it is available in anonymous comment.
+  [gotcha, smoussiaux]
+
 - Put defaultUser.png instead of old defaultUser.gif
   [bsuttor]
 
diff --git a/plone/app/discussion/contentrules.py b/plone/app/discussion/contentrules.py
index 155c8c1..0dd6681 100644
--- a/plone/app/discussion/contentrules.py
+++ b/plone/app/discussion/contentrules.py
@@ -1,8 +1,6 @@
 """ Content rules handlers
 """
-from Acquisition import aq_parent
 from plone.app.contentrules.handlers import execute
-from plone.stringinterp import adapters
 
 def execute_comment(event):
     """ Execute comment content rules