From ac666490d240dde7593503e72d82d60fce78bfed Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 6 May 2014 23:59:49 -0400
Subject: [PATCH] Release 2.0.2

---
 History.markdown      | 12 +++++++++---
 lib/jekyll/version.rb |  2 +-
 site/docs/history.md  |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/History.markdown b/History.markdown
index e9636ad5..1aecc347 100644
--- a/History.markdown
+++ b/History.markdown
@@ -6,11 +6,17 @@
 
 ### Bug Fixes
 
+### Development Fixes
+
+### Site Enhancements
+
+## v2.0.2 / 2014-05-07
+
+### Bug Fixes
+
 * Correct use of `url` and `baseurl` in the site template. (#2317)
 * Default `baseurl` to `""` (#2317)
 
-### Development Fixes
-
 ### Site Enhancements
 
 * Correct docs for the `gist` plugin so it always includes the username. (#2314)
@@ -165,7 +171,7 @@
   * Refactor `Commands::Serve`. (#2269)
   * Refactor `highlight` tag (#2154)
   * Update `Util` hash functions with latest from Rails (#2273)
-  * Workaround for Travis bug (#2290) 
+  * Workaround for Travis bug (#2290)
 
 ### Site Enhancements
   * Document Kramdown's GFM parser option (#1791)
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index 0ed41bca..3ef9734a 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end
diff --git a/site/docs/history.md b/site/docs/history.md
index 59cf0d2b..cdff8808 100644
--- a/site/docs/history.md
+++ b/site/docs/history.md
@@ -152,7 +152,7 @@ prev_section: contributing
 - Refactor `Commands::Serve`. ([#2269]({{ site.repository }}/issues/2269))
 - Refactor `highlight` tag ([#2154]({{ site.repository }}/issues/2154))
 - Update `Util` hash functions with latest from Rails ([#2273]({{ site.repository }}/issues/2273))
-- Workaround for Travis bug ([#2290]({{ site.repository }}/issues/2290)) 
+- Workaround for Travis bug ([#2290]({{ site.repository }}/issues/2290))
 
 ### Site Enhancements
 - Document Kramdown's GFM parser option ([#1791]({{ site.repository }}/issues/1791))