From 1763acd6f9bf686088fcd89747783e6bf45b60f8 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 27 Jun 2013 20:21:23 +0200
Subject: [PATCH] Update history to reflect merge of #1247.

---
 History.markdown | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/History.markdown b/History.markdown
index b8cbf4c4..5d77f99a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -6,7 +6,9 @@
     pagination. (#1198)
   * Add the ability to generate a new Jekyll site without a template (#1171)
   * Use redcarpet as the default markdown engine in newly generated
-    sites (#1245)
+    sites (#1245, #1247)
+  * Add `redcarpet` as a runtime dependency so `jekyll build` works out-of-the-box for new
+    sites. (#1247)
 
 ### Bug Fixes
   * Fix pagination in subdirectories. (#1198)
@@ -39,6 +41,7 @@
   * Tidy up the third-party plugins listing (#1228)
   * Update contributor information (#1192)
   * Update URL of article about Blogger migration (#1242)
+  * Specify that RedCarpet is the default for new Jekyll sites on Quickstart page (#1247)
 
 ### Development Fixes