From 8b36b71833ea96d092570f1261abf1b0271e9bf9 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 28 Jun 2014 16:59:08 -0400
Subject: [PATCH] Update history to reflect merge of #2552 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index abc089f8..a229b7e6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -50,6 +50,8 @@
   * Merge file system categories with categories from YAML. (#2531)
   * Deep merge front matter defaults (#2490)
   * Ensure exclude and include arrays are arrays of strings (#2542)
+  * Allow collections to have dots in their filenames (#2552)
+  * Collections shouldn't try to read in directories as files (#2552)
 
 ### Development Fixes