From: Tom Hughes <tom@compton.nu>
Date: Mon, 1 Apr 2013 13:40:52 +0000 (+0100)
Subject: Update bundle
X-Git-Tag: live~5071
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/10a7e1a5f00884494615e2b1a31ad64b582164e0?hp=93b1a8e1d6bca3d5c6d20b613d0f6e7b335f7198;ds=sidebyside

Update bundle
---

diff --git a/Gemfile.lock b/Gemfile.lock
index a53bc3d0d..c9bd6607c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -51,7 +51,7 @@ GEM
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    faraday (0.8.6)
+    faraday (0.8.7)
       multipart-post (~> 1.1)
     hike (1.2.1)
     htmlentities (4.3.1)
@@ -76,7 +76,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     memcached (1.5.0)
-    mime-types (1.21)
+    mime-types (1.22)
     minitest (4.7.0)
     multi_json (1.7.2)
     multi_xml (0.5.3)
@@ -102,7 +102,7 @@ GEM
       activesupport (>= 2.3.2)
       cocaine (>= 0.0.2)
       mime-types
-    pg (0.14.1)
+    pg (0.15.0)
     polyglot (0.3.3)
     r2 (0.1.0)
     rack (1.4.5)
@@ -134,7 +134,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
+    rake (10.0.4)
     rdoc (3.12.2)
       json (~> 1.4)
     redcarpet (2.2.2)
@@ -154,7 +154,7 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     therubyracer (0.10.2)
       libv8 (~> 3.3.10)
-    thor (0.17.0)
+    thor (0.18.1)
     tilt (1.3.6)
     timecop (0.6.1)
     treetop (1.4.12)