From 97797cb24118068e0a28fedef19fabb5dd129b4d Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Sat, 24 Jan 2015 11:24:35 -0800
Subject: [PATCH] Update history to reflect merge of #3325 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index f44d0dfc..c360317a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -40,6 +40,7 @@
   * Highlight: Only Strip Newlines/Carriage Returns, not Spaces (#3278)
   * Find variables in front matter defaults by searching with relative file path. (#2774)
   * Allow variables (e.g `:categories`) in YAML front matter permalinks (#3320)
+  * Handle nil URL placeholders in permalinks (#3325)
 
 ### Development Fixes