From c5aa74f823015802d531bb4b6eb70e19fb230205 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 24 Jun 2014 23:04:53 -0400
Subject: [PATCH] Update history to reflect merge of #2490 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 7d8ab59e..d3ff38ce 100644
--- a/History.markdown
+++ b/History.markdown
@@ -46,6 +46,7 @@
   * Ignore *all* directories and files that merit it on auto-generation (#2459)
   * Before copying file, explicitly remove the old one (#2535)
   * Merge file system categories with categories from YAML. (#2531)
+  * Deep merge front matter defaults (#2490)
 
 ### Development Fixes