From 0db5dcf832170034f10eb3a98a4c8cb4ba069f19 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 25 Jul 2013 09:15:34 +0200
Subject: [PATCH] Release 1.1.2

---
 History.markdown                              |  6 ++++--
 jekyll.gemspec                                |  7 +++++--
 lib/jekyll.rb                                 |  2 +-
 .../2013-07-25-jekyll-1-0-4-released.markdown | 20 +++++++++++++++++++
 .../2013-07-25-jekyll-1-1-2-released.markdown | 20 +++++++++++++++++++
 5 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 site/_posts/2013-07-25-jekyll-1-0-4-released.markdown
 create mode 100644 site/_posts/2013-07-25-jekyll-1-1-2-released.markdown

diff --git a/History.markdown b/History.markdown
index 1ea29696..f4150bc5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -5,11 +5,13 @@
 ### Minor Enhancements
 
 ### Bug Fixes
-  * Require Liquid 2.5.1 (#1349)
 
 ### Development Fixes
 
-### Site Enhancements
+## v1.1.2 / 2013-07-25
+
+### Bug Fixes
+  * Require Liquid 2.5.1 (#1349)
 
 ## v1.1.1 / 2013-07-24
 
diff --git a/jekyll.gemspec b/jekyll.gemspec
index 8748275b..b29d9667 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -4,9 +4,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'jekyll'
-  s.version           = '1.1.1'
+  s.version           = '1.1.2'
   s.license           = 'MIT'
-  s.date              = '2013-07-24'
+  s.date              = '2013-07-25'
   s.rubyforge_project = 'jekyll'
 
   s.summary     = "A simple, blog aware, static site generator."
@@ -141,6 +141,9 @@ Gem::Specification.new do |s|
     site/_posts/2013-05-12-jekyll-1-0-2-released.markdown
     site/_posts/2013-06-07-jekyll-1-0-3-released.markdown
     site/_posts/2013-07-14-jekyll-1-1-0-released.markdown
+    site/_posts/2013-07-24-jekyll-1-1-1-released.markdown
+    site/_posts/2013-07-25-jekyll-1-0-4-released.markdown
+    site/_posts/2013-07-25-jekyll-1-1-2-released.markdown
     site/css/gridism.css
     site/css/normalize.css
     site/css/pygments.css
diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index c1693ee3..3f575837 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -58,7 +58,7 @@ require_all 'jekyll/tags'
 SafeYAML::OPTIONS[:suppress_warnings] = true
 
 module Jekyll
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 
   # Public: Generate a Jekyll configuration Hash by merging the default
   # options with anything in _config.yml, and adding the given options on top.
diff --git a/site/_posts/2013-07-25-jekyll-1-0-4-released.markdown b/site/_posts/2013-07-25-jekyll-1-0-4-released.markdown
new file mode 100644
index 00000000..7228b5ac
--- /dev/null
+++ b/site/_posts/2013-07-25-jekyll-1-0-4-released.markdown
@@ -0,0 +1,20 @@
+---
+layout: news_item
+title: "Jekyll 1.0.4 Released"
+date: "2013-07-25 09:08:38 +0200"
+author: parkr
+version: 1.0.4
+categories: [release]
+---
+
+This version contains a [very important security patch][230] for `Liquid::Drop` plugins
+which granted access to all non-`Drop` entities within a `Drop`, which may include your
+Rack configuration settings and many more pieces of private information which could be
+used to exploit your system. We recommend you upgrade to v1.0.4 as quickly as possible if
+you use `Liquid::Drop` plugins in your site.
+
+Many thanks for [Ben Balter](http://github.com/benbalter) for alerting us to the problem
+and [submitting a patch][1349] so quickly.
+
+[230]: https://github.com/Shopify/liquid/pull/230
+[1349]: https://github.com/mojombo/jekyll/issues/1349
diff --git a/site/_posts/2013-07-25-jekyll-1-1-2-released.markdown b/site/_posts/2013-07-25-jekyll-1-1-2-released.markdown
new file mode 100644
index 00000000..723787d9
--- /dev/null
+++ b/site/_posts/2013-07-25-jekyll-1-1-2-released.markdown
@@ -0,0 +1,20 @@
+---
+layout: news_item
+title: "Jekyll 1.1.2 Released"
+date: "2013-07-25 09:08:38 +0200"
+author: parkr
+version: 1.1.2
+categories: [release]
+---
+
+This version contains a [very important security patch][230] for `Liquid::Drop` plugins
+which granted access to all non-`Drop` entities within a `Drop`, which may include your
+Rack configuration settings and many more pieces of private information which could be
+used to exploit your system. We recommend you upgrade to v1.1.2 as quickly as possible if
+you use `Liquid::Drop` plugins in your site.
+
+Many thanks for [Ben Balter](http://github.com/benbalter) for alerting us to the problem
+and [submitting a patch][1349] so quickly.
+
+[230]: https://github.com/Shopify/liquid/pull/230
+[1349]: https://github.com/mojombo/jekyll/issues/1349