From f922ae10e5793255ca1af201948d8809842425d1 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 14 Sep 2013 20:49:23 -0400
Subject: [PATCH 1/4] Update the History file

---
 History.markdown | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/History.markdown b/History.markdown
index 25ae1e2f..16267de1 100644
--- a/History.markdown
+++ b/History.markdown
@@ -2,6 +2,16 @@
 
 ### Major Enhancements
 
+### Minor Enhancements
+
+### Bug Fixes
+
+### Development Fixes
+
+### Site Enhancements
+
+## 1.2.1 / 2013-09-14
+
 ### Minor Enhancements
   * Print better messages for detached server. Mute output on detach. (#1518)
   * Disable reverse lookup when running `jekyll serve` (#1363)

From f169e37c814b8e2544bee63e4646744f4398f178 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 14 Sep 2013 20:56:42 -0400
Subject: [PATCH 2/4] Add release post.

---
 .../2013-09-14-jekyll-1-2-1-released.markdown | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 site/_posts/2013-09-14-jekyll-1-2-1-released.markdown

diff --git a/site/_posts/2013-09-14-jekyll-1-2-1-released.markdown b/site/_posts/2013-09-14-jekyll-1-2-1-released.markdown
new file mode 100644
index 00000000..26a6ca15
--- /dev/null
+++ b/site/_posts/2013-09-14-jekyll-1-2-1-released.markdown
@@ -0,0 +1,19 @@
+---
+layout: news_item
+title: 'Jekyll 1.2.1 Released'
+date: 2013-09-14 20:46:50 -0400
+author: parkr
+version: 1.2.1
+categories: [release]
+---
+
+Quick turnover, anyone? A [recent incompatibility with Liquid
+v2.5.2](https://github.com/mojombo/jekyll/pull/1525) produced a nasty bug in
+which `include` tags were not rendered properly within `if` blocks. 
+
+This release also includes a better handling of detached servers (prints pid and
+the command for killing the process). **Note**: the `--detach` flag and
+`--watch` flags are presently incompatible in 1.2.x. Fix for that coming soon!
+
+For a full list of the fixes in this release, check out [the change
+log](/docs/history/)!

From be9c0dcc7ea8a8bac47864b49f411168734c3ab6 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 14 Sep 2013 20:57:10 -0400
Subject: [PATCH 3/4] Update docs/history.md for v1.2.1

---
 site/docs/history.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/site/docs/history.md b/site/docs/history.md
index 6c4653fe..1b2e7ffc 100644
--- a/site/docs/history.md
+++ b/site/docs/history.md
@@ -5,6 +5,30 @@ permalink: /docs/history/
 prev_section: contributing
 ---
 
+## 1.2.1 / 2013-09-14
+
+### Minor Enhancements
+- Print better messages for detached server. Mute output on detach. ([#1518]({{ site.repository }}/issues/1518))
+- Disable reverse lookup when running `jekyll serve` ([#1363]({{ site.repository }}/issues/1363))
+- Upgrade RedCarpet dependency to `~> 2.3.0` ([#1515]({{ site.repository }}/issues/1515))
+- Upgrade to Liquid `>= 2.5.2, < 2.6` ([#1536]({{ site.repository }}/issues/1536))
+
+### Bug Fixes
+- Fix file discrepancy in gemspec ([#1522]({{ site.repository }}/issues/1522))
+- Force rendering of Include tag ([#1525]({{ site.repository }}/issues/1525))
+
+### Development Fixes
+- Add a rake task to generate a new release post ([#1404]({{ site.repository }}/issues/1404))
+- Mute LSI output in tests ([#1531]({{ site.repository }}/issues/1531))
+- Update contributor documentation ([#1537]({{ site.repository }}/issues/1537))
+
+### Site Enhancements
+- Fix a couple of validation errors on the site ([#1511]({{ site.repository }}/issues/1511))
+- Make navigation menus reusable ([#1507]({{ site.repository }}/issues/1507))
+- Fix link to History page from Release v1.2.0 notes post.
+- Fix markup in History file for command line options ([#1512]({{ site.repository }}/issues/1512))
+- Expand 1.2 release post title to 1.2.0 ([#1516]({{ site.repository }}/issues/1516))
+
 ## 1.2.0 / 2013-09-06
 
 ### Major Enhancements

From 6f053fbc8ca1d7307b89106f96a8042d734be221 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 14 Sep 2013 20:59:06 -0400
Subject: [PATCH 4/4] Update gemspec & version to v1.2.1

---
 jekyll.gemspec | 5 +++--
 lib/jekyll.rb  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/jekyll.gemspec b/jekyll.gemspec
index 5d957e9d..7617a8e9 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.2.0'
+  s.version           = '1.2.1'
   s.license           = 'MIT'
-  s.date              = '2013-09-06'
+  s.date              = '2013-09-14'
   s.rubyforge_project = 'jekyll'
 
   s.summary     = "A simple, blog aware, static site generator."
@@ -149,6 +149,7 @@ Gem::Specification.new do |s|
     site/_posts/2013-07-25-jekyll-1-0-4-released.markdown
     site/_posts/2013-07-25-jekyll-1-1-2-released.markdown
     site/_posts/2013-09-06-jekyll-1-2-0-released.markdown
+    site/_posts/2013-09-14-jekyll-1-2-1-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 a48d3460..7eb2dda9 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -60,7 +60,7 @@ require_all 'jekyll/tags'
 SafeYAML::OPTIONS[:suppress_warnings] = true
 
 module Jekyll
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 
   # Public: Generate a Jekyll configuration Hash by merging the default
   # options with anything in _config.yml, and adding the given options on top.