From a5b035ece80621fc92f1a5d672fda6f2d2cc8f64 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 11 Aug 2013 12:52:24 +0200
Subject: [PATCH] Update history to reflect merge of #963

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

diff --git a/History.markdown b/History.markdown
index 77f8b76f..84895da2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -17,6 +17,7 @@
   * Use binary mode when writing file (#1364)
   * Fix 'undefined method `encoding` for "mailto"' errors w/ Ruby 1.8 and
     Kramdown > 0.14.0 (#1397)
+  * Do not force the permalink to be a dir if it ends on .html (#963)
 
 ### Development Fixes
   * Remove redundant argument to