From 258c7d6e4a0c064ec46ed5234dde9989f3b0c52e Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 20 Jul 2013 23:57:29 +0200
Subject: [PATCH] Update history to reflect merge of #1318

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

diff --git a/History.markdown b/History.markdown
index 7c2259cf..977d5f2d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -17,6 +17,7 @@
   * Improve the layout of the plugin listing by organizing it into
     categories (#1310)
   * Add generator-jekyllrb and grunt-jekyll to plugins page (#1330)
+  * Mention Kramdown as option for markdown parser on Extras page (#1318)
 
 ## 1.1.0 / 2013-07-14