From 6d74b4df009f22dbe8ef893702359a1004b4df79 Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Wed, 2 Oct 2013 21:48:03 -0500
Subject: [PATCH] Update history to reflect merge of #1596

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

diff --git a/History.markdown b/History.markdown
index 2a1f03c5..12dd0ab2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -9,6 +9,8 @@
   * Add `encoding` configuration option (#1449)
   * Provide better error handling for Jekyll's custom Liquid tags
     (#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)
 
 ### Bug Fixes
   * Fix up matching against source and destination when the two