From 6a7ed52b37635660e68ab427fa6b6a1773641404 Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Fri, 17 May 2013 22:46:11 -0500
Subject: [PATCH] Update history to reflect merge of #1114

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

diff --git a/History.markdown b/History.markdown
index 0b566239..2ee70bed 100644
--- a/History.markdown
+++ b/History.markdown
@@ -8,6 +8,8 @@
 ### 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)
+  * Make the `exclude` and `include` options backwards compatible with
+    versions of Jekyll prior to 1.0 (#1114)
 
 ### Site Enhancements
   * Add link to jekyll-minibundle in the doc's plugins list (#1035)