From a64e7e8814611a696364059f251aaa707f3c0bf0 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 20 Oct 2014 20:08:04 -0700
Subject: [PATCH] Update history to reflect merge of #3011 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e9c21629..2fd8a6f0 100644
--- a/History.markdown
+++ b/History.markdown
@@ -53,6 +53,7 @@
   * Add 'Jekyll Twitter Plugin' to list of third-party plugins (#2979)
   * Docs: Update normalize.css to v3.0.2. (#2981)
   * Fix typo in Continuous Integration documentation (#2984)
+  * Clarify behavior of `:categories` in permalinks (#3011)
 
 ## 2.4.0 / 2014-09-09