From 581f34dced6dd23e69adc55dbb72d29746d60d84 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 21 May 2014 01:09:27 -0400
Subject: [PATCH] Update history to reflect merge of #2395 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 62f87751..69ad4e59 100644
--- a/History.markdown
+++ b/History.markdown
@@ -9,6 +9,7 @@
   * Add `Jekyll.env` and `jekyll.environment` (the Liquid var) (#2417)
   * Use `_config.yaml` or `_config.yml` (`.yml` takes precedence) (#2406)
   * Override collection url template (#2418)
+  * Allow subdirectories in `_data` (#2395)
 
 ### Bug Fixes