From 96138b09d468c06c8c3a63cd3f451488162c7265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 5 Jun 2013 18:22:34 +0200
Subject: [PATCH] update middleman

---
 Gemfile.lock | 58 ++++++++++++++++++++++++++++------------------------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 626cbaa..e84d283 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -21,26 +21,26 @@ GEM
     eventmachine (1.0.3)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    ffi (1.6.0)
+    ffi (1.8.1)
     fssm (0.2.10)
-    haml (4.0.1)
+    haml (4.0.3)
       tilt
-    hike (1.2.1)
+    hike (1.2.3)
     http_parser.rb (0.5.3)
     http_router (0.10.2)
       rack (>= 1.0.0)
       url_mount (~> 0.2.1)
     httpclient (2.3.3)
     i18n (0.6.1)
-    json (1.7.7)
+    json (1.8.0)
     listen (0.7.3)
     maruku (0.6.1)
       syntax (>= 1.0.0)
-    middleman (3.0.13)
-      middleman-core (= 3.0.13)
-      middleman-more (= 3.0.13)
-      middleman-sprockets (~> 3.0.8)
-    middleman-core (3.0.13)
+    middleman (3.0.14)
+      middleman-core (= 3.0.14)
+      middleman-more (= 3.0.14)
+      middleman-sprockets (~> 3.1.0)
+    middleman-core (3.0.14)
       activesupport (~> 3.2.6)
       bundler (~> 1.1)
       listen (~> 0.7.3)
@@ -49,12 +49,12 @@ GEM
       rb-fsevent (~> 0.9.3)
       thor (~> 0.15.4)
       tilt (~> 1.3.6)
-    middleman-livereload (3.0.1)
+    middleman-livereload (3.1.0)
       em-websocket (>= 0.2.0)
-      middleman-core (~> 3.0.2)
+      middleman-core (>= 3.0.2)
       multi_json (~> 1.0)
       rack-livereload
-    middleman-more (3.0.13)
+    middleman-more (3.0.14)
       coffee-script (~> 2.2.0)
       coffee-script-source (~> 1.3.3)
       compass (>= 0.12.2)
@@ -62,18 +62,20 @@ GEM
       haml (>= 3.1.6)
       i18n (~> 0.6.0, < 0.6.2)
       maruku (~> 0.6.0)
-      middleman-core (= 3.0.13)
+      middleman-core (= 3.0.14)
       padrino-helpers (= 0.10.7)
       sass (>= 3.1.20)
       uglifier (~> 1.2.6)
     middleman-smusher (3.0.0)
       middleman (>= 3.0.0)
       smusher (~> 0.4.9)
-    middleman-sprockets (3.0.10)
-      middleman-more (>= 3.0.11)
-      sprockets (~> 2.1, < 2.5)
-      sprockets-sass (~> 0.9.1)
-    multi_json (1.7.2)
+    middleman-sprockets (3.1.1)
+      middleman-core (>= 3.0.14)
+      padrino-helpers (= 0.10.7)
+      sprockets (~> 2.1)
+      sprockets-helpers (~> 1.0.0)
+      sprockets-sass (~> 1.0.0)
+    multi_json (1.7.6)
     oily_png (1.1.0)
       chunky_png (~> 1.2.7)
     padrino-core (0.10.7)
@@ -86,7 +88,7 @@ GEM
       i18n (~> 0.6)
       padrino-core (= 0.10.7)
     rack (1.4.5)
-    rack-livereload (0.3.13)
+    rack-livereload (0.3.15)
       rack
     rack-protection (1.5.0)
       rack
@@ -96,33 +98,35 @@ GEM
     rb-fsevent (0.9.3)
     rb-inotify (0.9.0)
       ffi (>= 0.5.0)
-    sass (3.2.7)
+    sass (3.2.9)
     sinatra (1.3.6)
       rack (~> 1.4)
       rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
-    slim (1.3.6)
-      temple (~> 0.5.5)
-      tilt (~> 1.3.3)
+    slim (2.0.0)
+      temple (~> 0.6.5)
+      tilt (~> 1.3, >= 1.3.3)
     smusher (0.4.9)
       httpclient (>= 2.2)
       json
       rake
-    sprockets (2.4.5)
+    sprockets (2.10.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-sass (0.9.1)
+    sprockets-helpers (1.0.1)
+      sprockets (~> 2.0)
+    sprockets-sass (1.0.1)
       sprockets (~> 2.0)
       tilt (~> 1.1)
     susy (1.0.8)
       compass (>= 0.12.2)
       sass (>= 3.2.0)
     syntax (1.0.0)
-    temple (0.5.5)
+    temple (0.6.5)
     thor (0.15.4)
-    tilt (1.3.6)
+    tilt (1.3.7)
     uglifier (1.2.7)
       execjs (>= 0.3.0)
       multi_json (~> 1.3)