From a5cb8c9f64651c7067eed08c88fd4b1e862293f6 Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Fri, 4 Oct 2013 07:40:43 -0500
Subject: [PATCH] Update history to reflect merge of #1601

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

diff --git a/History.markdown b/History.markdown
index 6feedf5a..7c03d13e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -11,6 +11,8 @@
     (#1514)
   * If an included file causes a Liquid error, add the path to the
     include file that caused the error to the error message (#1596)
+  * If a layout causes a Liquid error, change the error message so that
+    we know it comes from the layout (#1601)
 
 ### Bug Fixes
   * Fix up matching against source and destination when the two