From: John Firebaugh <john.firebaugh@gmail.com>
Date: Tue, 19 Nov 2013 17:42:47 +0000 (-0800)
Subject: Merge branch 'master' into redesign
X-Git-Tag: live~5282^2~40
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/44629832dd0207d7b0f50b93f1d00b4373dd4d49

Merge branch 'master' into redesign

Conflicts:
	vendor/assets/leaflet/leaflet.hash.js
	vendor/assets/leaflet/leaflet.js
---

44629832dd0207d7b0f50b93f1d00b4373dd4d49
diff --cc vendor/assets/leaflet/leaflet.js
index 0f0b01be2,fa26f6e2c..2b66295fc
--- a/vendor/assets/leaflet/leaflet.js
+++ b/vendor/assets/leaflet/leaflet.js
@@@ -8914,4 -9188,4 +9188,4 @@@ L.Map.include(
  });
  
  
--}(window, document));
++}(window, document));