From 1715956baa4cf30ff75f65270476f939a8b48a27 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 17 Jan 2015 15:13:46 -0800
Subject: [PATCH] Update history to reflect merge of #3014 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index fc3034d7..ec97ec12 100644
--- a/History.markdown
+++ b/History.markdown
@@ -24,6 +24,7 @@
 
 ### Bug Fixes
 
+  * Make permalink parsing consistent with pages (#3014)
   * `time()`pre-filter method should accept a `Date` object (#3299)
   * Remove unneeded end tag for `link` in site template (#3236)
   * Kramdown: Use `enable_coderay` key instead of `use_coderay` (#3237)