From 1502d0006331969736c68f74a2f08d618a453db5 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Wed, 25 May 2016 15:44:24 -0700
Subject: [PATCH] Update history to reflect merge of #4943 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 96a3fb47..8a5098e2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -47,6 +47,7 @@
 
   * From v3.1.4: Add ExcerptDrop and remove excerpt's ability to refer to itself in Liquid (#4941)
   * From v3.1.4: Configuration permalink fix and addition of Configuration.from and sorting `site.collections` by label (#4942)
+  * From v3.1.4: Fix `{{ layout }}` oddities (proper inheritance & fixing overflow of old data) (#4943)
 
 ### Development Fixes