From 53459fe160e9240282d7db5c77a7268ef8ee19fc Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Mon, 31 Dec 2012 15:57:16 +0100
Subject: [PATCH] release v1.2.3

---
 CHANGELOG.md     | 4 ++++
 src/package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31cd7756d..8e9404f10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.2.3
+ * Fix #1307: Chrome needs console.log to be called on console obj
+ * Fix #1309: We had broken support for node v0.6 in the last release
+
 # 1.2.2
  * More translations and better language support.  See https://translatewiki.net/wiki/Translating:Etherpad_lite for more details
  * Add a checkToken Method to the API
diff --git a/src/package.json b/src/package.json
index 02073ea1b..67acd1260 100644
--- a/src/package.json
+++ b/src/package.json
@@ -46,5 +46,5 @@
   "engines"        : { "node" : ">=0.6.0",
                        "npm"  : ">=1.0"
                      }, 
-  "version"        : "1.2.2"
+  "version"        : "1.2.3"
 }