From f2821dd9f23d7f2f6aca6b97e0c2b3208c180e46 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Fri, 16 Aug 2013 17:51:30 -0700
Subject: [PATCH] 1.1.4

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index decb9dbc6..407dec4ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.1.4
+
+* Fix adding multilingual name (#1694)
+* Fix social buttons (#1690)
+* Work around a Firefox bug that sometimes caused elements to be unselectable or stuck dragging (#1691, #1692)
+
 ## 1.1.3
 
 * Fix behavior of enter key in name field (#1681)
diff --git a/js/id/id.js b/js/id/id.js
index ab41ab73d..d8c5e565a 100644
--- a/js/id/id.js
+++ b/js/id/id.js
@@ -223,7 +223,7 @@ window.iD = function () {
     return d3.rebind(context, dispatch, 'on');
 };
 
-iD.version = '1.1.3';
+iD.version = '1.1.4';
 
 (function() {
     var detected = {};
diff --git a/package.json b/package.json
index 23fa2d82a..d7bf0781b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iD",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "a new editor for openstreetmap",
   "main": "iD.js",
   "directories": {