From 04e1768807b80f65c605cdb900ec6f7fa6ab1f45 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Fri, 15 Jan 2016 15:06:56 -0800
Subject: [PATCH] Update history to reflect merge of #4359 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e81859553..cd35e99ac 100644
--- a/History.markdown
+++ b/History.markdown
@@ -36,6 +36,7 @@
   * utils: `has_yaml_header?` should accept files with extraneous spaces (#4290)
   * Escape html from site.title and page.title in site template (#4307)
   * Allow custom file extensions if defined in `permalink` YAML front matter (#4314)
+  * Fix deep_merge_hashes! handling of drops and hashes (#4359)
 
 ### Development Fixes