From 70b1112cca2078eeba45435f875a0a4986e31dbc Mon Sep 17 00:00:00 2001
From: Tom Preston-Werner <tom@mojombo.com>
Date: Mon, 30 May 2011 11:45:30 -0700
Subject: [PATCH] Update history.

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

diff --git a/History.txt b/History.txt
index d9756cac..042e9074 100644
--- a/History.txt
+++ b/History.txt
@@ -2,6 +2,7 @@
   * Major Enhancements
     * Add command line importer functionality (#253)
     * Add Recarpet Markdown support (#318)
+    * Make markdown/textile extensions configurable (#312)
   * Minor Enhancements
     * Switch to Albino gem
     * Bundler support