From 9614d516f03151b91e1a7ab51fa9d03699faa705 Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Fri, 17 May 2013 22:43:56 -0500
Subject: [PATCH] Update history to reflect merge of #1121

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

diff --git a/History.markdown b/History.markdown
index efcc7cf8..0b566239 100644
--- a/History.markdown
+++ b/History.markdown
@@ -7,6 +7,7 @@
 
 ### Bug Fixes
   * Rename Jekyll::Logger to Jekyll::Stevenson to fix inheritance issue (#1106)
+  * Exit with a non-zero exit code when dealing with a Liquid error (#1121)
 
 ### Site Enhancements
   * Add link to jekyll-minibundle in the doc's plugins list (#1035)