From 79f95b7a1c035e7279746169e15933136dbe78dc Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 8 Jul 2013 22:21:10 +0200
Subject: [PATCH] Update history to reflect merge of #1267.

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

diff --git a/History.markdown b/History.markdown
index bfdcd526..6468159a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -23,6 +23,7 @@
   * Merge the theme and layout cucumber steps into one step (#1151)
   * Restrict activesupport dependency to pre-4.0.0 to maintain compatibility with `<= 1.9.2`
   * Include/exclude deprecation handling simplification (#1284)
+  * Convert README to Markdown. (#1267)
 
 ### Site Enhancements
   * Add "News" section for release notes, along with an RSS feed (#1093, #1285, #1286)