From 5bf40983564ffe85a21eee9048f5339fc3ca4913 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 6 May 2014 12:14:50 -0400
Subject: [PATCH] Update history to reflect merge of #2301 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index c724b59d..7ae25c84 100644
--- a/History.markdown
+++ b/History.markdown
@@ -67,6 +67,7 @@
   * Remove literal lang name from class (#2292)
   * Return `utf-8` encoding in header for  webrick error page response (#2289)
   * Make template site easier to customize (#2268)
+  * Add two-digit year to permalink template option (#2301)
 
 ### Bug Fixes
   * Don't allow nil entries when loading posts (#1796)