From c15aef7748306e415f23698a060bdefbf3f00b28 Mon Sep 17 00:00:00 2001
From: Jan-Erik Rediger <janerik@fnordig.de>
Date: Tue, 6 Jan 2015 21:03:59 +0100
Subject: [PATCH] Update jekyll

---
 Gemfile      |  2 +-
 Gemfile.lock | 80 ++++++++++++++++++++++++++++++++++++----------------
 2 files changed, 57 insertions(+), 25 deletions(-)

diff --git a/Gemfile b/Gemfile
index b4277fb..94e0198 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem "jekyll", "~>1.0.0"
+gem "jekyll", "~>2.5.3"
 gem "coderay", "~>1.0.0"
 gem "kramdown"
diff --git a/Gemfile.lock b/Gemfile.lock
index 1c07798..81fa50f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,35 +1,67 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    classifier (1.3.3)
-      fast-stemmer (>= 1.0.0)
+    blankslate (2.1.2.4)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    classifier-reborn (2.0.3)
+      fast-stemmer (~> 1.0)
     coderay (1.0.8)
+    coffee-script (2.3.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.8.0)
     colorator (0.1)
-    commander (4.1.3)
-      highline (~> 1.6.11)
-    directory_watcher (1.4.1)
+    execjs (2.2.2)
     fast-stemmer (1.0.2)
-    highline (1.6.15)
-    jekyll (1.0.0)
-      classifier (~> 1.3)
+    ffi (1.9.6)
+    hitimes (1.2.2)
+    jekyll (2.5.3)
+      classifier-reborn (~> 2.0)
       colorator (~> 0.1)
-      commander (~> 4.1.3)
-      directory_watcher (~> 1.4.1)
-      kramdown (~> 0.14)
-      liquid (~> 2.3)
-      maruku (~> 0.5)
-      pygments.rb (~> 0.4.2)
-      safe_yaml (~> 0.7.0)
-    kramdown (0.14.2)
-    liquid (2.5.0)
-    maruku (0.6.1)
-      syntax (>= 1.0.0)
-    posix-spawn (0.3.6)
-    pygments.rb (0.4.2)
+      jekyll-coffeescript (~> 1.0)
+      jekyll-gist (~> 1.0)
+      jekyll-paginate (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.1)
+      kramdown (~> 1.3)
+      liquid (~> 2.6.1)
+      mercenary (~> 0.3.3)
+      pygments.rb (~> 0.6.0)
+      redcarpet (~> 3.1)
+      safe_yaml (~> 1.0)
+      toml (~> 0.1.0)
+    jekyll-coffeescript (1.0.1)
+      coffee-script (~> 2.2)
+    jekyll-gist (1.1.0)
+    jekyll-paginate (1.1.0)
+    jekyll-sass-converter (1.3.0)
+      sass (~> 3.2)
+    jekyll-watch (1.2.0)
+      listen (~> 2.7)
+    kramdown (1.5.0)
+    liquid (2.6.1)
+    listen (2.8.4)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    mercenary (0.3.5)
+    parslet (1.5.0)
+      blankslate (~> 2.0)
+    posix-spawn (0.3.9)
+    pygments.rb (0.6.0)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
-    safe_yaml (0.7.1)
-    syntax (1.0.0)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    redcarpet (3.2.2)
+    safe_yaml (1.0.4)
+    sass (3.4.9)
+    timers (4.0.1)
+      hitimes
+    toml (0.1.2)
+      parslet (~> 1.5.0)
     yajl-ruby (1.1.0)
 
 PLATFORMS
@@ -37,5 +69,5 @@ PLATFORMS
 
 DEPENDENCIES
   coderay (~> 1.0.0)
-  jekyll (~> 1.0.0)
+  jekyll (~> 2.5.3)
   kramdown