From fadfa6772e470e285a8b69b4ede0c72760398257 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Mon, 7 Jan 2013 19:31:29 +0000
Subject: [PATCH] changelog and package file

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e9404f1..80a6148f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# 1.2.4
+ * Fix IE console issue created in 1.2.3
+ * Allow CI Tests to pass by ignoring timeslider test
+ * Fix broken placeholders in locales
+ * Fix extractPadData script
+ * Fix documentation for checkToken
+ * Fix hitting enter on form in admin/plugins
+
 # 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
diff --git a/src/package.json b/src/package.json
index 67acd126..826db97b 100644
--- a/src/package.json
+++ b/src/package.json
@@ -46,5 +46,5 @@
   "engines"        : { "node" : ">=0.6.0",
                        "npm"  : ">=1.0"
                      }, 
-  "version"        : "1.2.3"
+  "version"        : "1.2.4"
 }