From 098a1ac5a76adc8120f98273d08cc18d36b519a0 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 10 Jul 2014 10:07:12 -0700
Subject: [PATCH] 1.5.1

---
 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 d2528491a..b86d6b477 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,10 @@
+## 1.5.1
+
+* Fix mixed content errors on https osm.org (#2281)
+* Fix suggested access values for parking (#2280)
+
 ## 1.5.0
+
 * Add support for localized address fields (#2246)
 * Rendering improvements for layers (#2250)
 * Add a map scale (#2266)
diff --git a/js/id/id.js b/js/id/id.js
index f0dd179dc..fdb8fd1bf 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.5.0';
+iD.version = '1.5.1';
 
 (function() {
     var detected = {};
diff --git a/package.json b/package.json
index 33166a811..414010060 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iD",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "a new editor for openstreetmap",
   "main": "iD.js",
   "directories": {