From 8add5aec4b8490aa129a01cee4d37c215f6b6dc8 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 15 Oct 2015 11:38:42 -0700
Subject: [PATCH] Update history to reflect merge of #4029

[ci skip]
---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 139cc274..3a844840 100644
--- a/History.markdown
+++ b/History.markdown
@@ -261,6 +261,7 @@
   * Add installation instructions for 2 of 3 options for plugins (#4013)
   * Add alternative jekyll gem installation instructions (#4018)
   * Fix a few typos and formatting problems. (#4022)
+  * Fix pretty permalink example (#4029)
 
 ## 2.5.3 / 2014-12-22