From 6f9a9c90b8f9b8ef244dd2c04e578e2f8b4375cd Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 30 Sep 2013 17:14:45 -0700
Subject: [PATCH] 1.2.1

---
 CHANGELOG.md | 15 +++++++++++++++
 js/id/id.js  |  2 +-
 package.json |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf6e25f7e..4531f3845 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+## 1.2.1
+
+* Split only the line of a node shared by a line and an area
+* Handle multipolygon corner case when splitting (#1799)
+* Don't automatically apply building tags to shop=car (#1813)
+* Don't suggest adding a relation to itself (#1820)
+* Fix restoring changes when something is selected (#1857)
+* Use generic access value as placeholder (#1780)
+* Filter on combobox value, not title (#1836)
+* Show relation documentation for relation presets (#1862)
+* Limit squaring to near square or near straight nodes (#1733)
+* More clever splitting of closed ways
+* Improve circularize action
+* Add more tags to areas list
+
 ## 1.2.0
 
 * Don't auto-save intro tutorial edits (#1745, #1795)
diff --git a/js/id/id.js b/js/id/id.js
index 53b57d3e1..cfb42820c 100644
--- a/js/id/id.js
+++ b/js/id/id.js
@@ -265,7 +265,7 @@ window.iD = function () {
     return d3.rebind(context, dispatch, 'on');
 };
 
-iD.version = '1.2.0';
+iD.version = '1.2.1';
 
 (function() {
     var detected = {};
diff --git a/package.json b/package.json
index 7fae810a9..7eabf77fb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iD",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "a new editor for openstreetmap",
   "main": "iD.js",
   "directories": {