From a608494e18cec86637c1d72cbcb5d038b6d18207 Mon Sep 17 00:00:00 2001
From: Will Norris <will@willnorris.com>
Date: Wed, 4 Mar 2015 15:20:25 -0800
Subject: [PATCH] Update history to reflect merge of #3538 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index dd0e61df..fb95cca6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -11,6 +11,7 @@
   * Move to Rouge as default highlighter (#3323)
   * Mimic GitHub Pages `.html` extension stripping behavior in WEBrick (#3452)
   * Always include file extension on output files (#3490)
+  * Improved permalinks for pages and collections (#3538)
 
 ### Minor Enhancements