Merge pull request #1836 from jekyll/update-history-with-v1.4.x

Update `master` with v1.4.x changes

History.markdown

@@ -33,19 +33,16 @@
   * Add note about deploying to OpenShift (#1812)
   * Collect all Windows-related docs onto one page (#1818)
 
+## 1.4.2 / 2013-12-16
+
+### Bug Fixes
+  * Turn on Maruku fenced code blocks by default (#1830)
+
 ## 1.4.1 / 2013-12-09
 
-### Major Enhancements
-
-### Minor Enhancements
-
 ### Bug Fixes
   * Don't allow nil entries when loading posts (#1796)
 
-### Development Fixes
-
-### Site Enhancements
-
 ## 1.4.0 / 2013-12-07
 
 ### Major Enhancements

Rakefile

@@ -233,7 +233,7 @@ namespace :site do
         post.puts("title: 'Jekyll #{release} Released'")
         post.puts("date: #{Time.new.strftime('%Y-%m-%d %H:%M:%S %z')}")
         post.puts("author: ")
-        post.puts("version: #{version}")
+        post.puts("version: #{release}")
         post.puts("categories: [release]")
         post.puts("---")
         post.puts

site/_posts/2013-12-16-jekyll-1-4-2-released.markdown

@@ -0,0 +1,18 @@
+---
+layout: news_item
+title: 'Jekyll 1.4.2 Released'
+date: 2013-12-16 19:48:13 -0500
+author: parkr
+version: 1.4.2
+categories: [release]
+---
+
+This release fixes [a regression][] where Maruku fenced code blocks were turned
+off, instead of the previous default to on. We've added a new default
+configuration to our `maruku` config key: `fenced_code_blocks` and set it to
+default to `true`.
+
+If you do not wish to use Maruku fenced code blocks, you may turn this option
+off in your site's configuration file.
+
+[a regression]: https://github.com/jekyll/jekyll/pull/1830