From 8e0cb720810cfef1165824a0dbc7f13ac6051328 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Tue, 9 Aug 2011 19:33:38 +0000
Subject: [PATCH] Release 1.2.1-0

  - Merge changes from V_1_2_0_35_NEUHAUS
---
 CHANGES | 4 ++++
 VERSION | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index e658a77e..72d2e046 100644
--- a/CHANGES
+++ b/CHANGES
@@ -401,3 +401,7 @@ o YAbstractFamilyMember: added support for garbage collector
 1.2.0-0
 -------
 o merged changes from V_1_1_31_6_POST_ACCEPTANCE
+
+1.2.1-0
+-------
+o merged changes from V_1_2_0_35_NEUHAUS
diff --git a/VERSION b/VERSION
index ccea80b3..a8cf7c9d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.0-35-dev
+1.2.1-0-dev