From 63390ecb938621a0265b134f16afaaa157f96424 Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Tue, 25 Jun 2013 06:20:37 -0700
Subject: [PATCH] Update history to reflect merge of #1215

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

diff --git a/History.markdown b/History.markdown
index 40900a0c..2b8ec2b0 100644
--- a/History.markdown
+++ b/History.markdown
@@ -8,6 +8,8 @@
 
 ### Bug Fixes
   * Fix pagination in subdirectories. (#1198)
+  * Fix an issue with directories and permalinks that have a plus sign
+    (+) in them (#1215)
 
 ### Development Fixes
   * Merge the theme and layout cucumber steps into one step (#1151)