From ed815b0d2c302f91e4985137afd674cf102cec37 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 4 Jan 2016 13:07:33 -0800
Subject: [PATCH] Update history to reflect merge of #4296

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

diff --git a/History.markdown b/History.markdown
index b317e8d3..9e518526 100644
--- a/History.markdown
+++ b/History.markdown
@@ -62,6 +62,7 @@
   * Add `jekyll-commonmark` to list of third-party plugins (#4299)
   * Add documentation for incremental regeneration (#4293)
   * Add note about removal of relative permalink support in upgrading docs (#4303)
+  * Add Pro Tip to use front matter variable to create clean URLs (#4296)
 
 ## 3.0.1 / 2015-11-17