From 0c0896f0b244225addec22b169547bb66c9faa3e Mon Sep 17 00:00:00 2001
From: Eric Steele <esteele@plone.org>
Date: Fri, 16 Sep 2011 13:46:02 +0000
Subject: [PATCH] revert [52042]

svn path=/plone.app.discussion/trunk/; revision=52045
---
 CHANGES.txt | 10 ++++++++--
 setup.py    |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 3d0561b..01b5da1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,11 +1,17 @@
 Changelog
 =========
 
-2.1.1 (2011-09-16)
+2.1.1 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Fix control panel help text typos
+  [jonstahl]
 
+- Documentation about overriding the comments viewlet js added.
+  [timo]
+
+- Corrected location of Japanese po file.
+  [tyam]
 
 2.1.0 (unreleased)
 ------------------
diff --git a/setup.py b/setup.py
index 3941b70..f876273 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '2.1.1'
+version = '2.1.1dev'
 
 install_requires = [
     'setuptools',