From 12225f49eaed047a81ac4225aaa22adfe131d126 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 26 Oct 2015 17:31:00 -0700
Subject: [PATCH] Update History to reflect 45f69bb and 7b81f00 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 95757bf6..5059d172 100644
--- a/History.markdown
+++ b/History.markdown
@@ -147,6 +147,8 @@
   * Whole-post excerpts should match the post content (#4004)
   * Change default font weight to 400 to fix bold/strong text issues (#4050)
   * Document: Only auto-generate the excerpt if it's not overridden (#4062)
+  * Utils: `deep_merge_hashes` should also merge `default_proc` (45f69bb)
+  * Defaults: compare paths in `applies_path?` as `String`s to avoid confusion (7b81f00)
 
 ### Development Fixes