From 2dad826aff6e5824a1d63775ed52526fd1c31e9b Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 1 Jun 2013 16:04:45 +0200
Subject: [PATCH] Update history to reflect merge of #1146.

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

diff --git a/History.markdown b/History.markdown
index 66bff7aa..18d85eed 100644
--- a/History.markdown
+++ b/History.markdown
@@ -16,6 +16,7 @@
     (#1156)
 
 ### Site Enhancements
+  * Add note to Upgrading page about new config options in 1.0.x (#1146)
   * Documentation for `date_to_rfc822` and `uri_escape` (#1142)
   * Documentation highlight boxes shouldn't show scrollbars if not necessary (#1123)
   * Add link to jekyll-minibundle in the doc's plugins list (#1035)