From c834670e8a8696a54e915453023063a7404f62da Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 15 Aug 2013 14:53:06 -0700
Subject: [PATCH] 1.1.3

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da5a617e1..decb9dbc6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 1.1.3
+
+* Fix behavior of enter key in name field (#1681)
+* Remove area=yes when choosing an area preset (#1684)
+* Save history more frequently (#1345)
+* Fix combobox menu scroll bar behavior (#963)
+* After editing, give a sense when map is updated (#1660)
+* Clarify undo/redo tooltips (#1670)
+* Add emergency=fire_hydrant preset (#1674)
+* Refine power=generator preset (#1675)
+* Add leisure=track preset (#1683)
+
 ## 1.1.2
 
 * Fix cursor offset when clicking/dragging after resizing the window (#1678)
diff --git a/js/id/id.js b/js/id/id.js
index 5f4ac9c68..c6a265b45 100644
--- a/js/id/id.js
+++ b/js/id/id.js
@@ -216,7 +216,7 @@ window.iD = function () {
     return d3.rebind(context, dispatch, 'on');
 };
 
-iD.version = '1.1.2';
+iD.version = '1.1.3';
 
 (function() {
     var detected = {};
diff --git a/package.json b/package.json
index e2567a835..23fa2d82a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iD",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "a new editor for openstreetmap",
   "main": "iD.js",
   "directories": {