From 1c4974f6ea233f42513fd7b05b07e5d0c10a44f9 Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Wed, 19 Feb 2014 17:09:08 -0600
Subject: [PATCH] Update history to reflect merge of #2074

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

diff --git a/History.markdown b/History.markdown
index b2e150da..38d2d96e 100644
--- a/History.markdown
+++ b/History.markdown
@@ -121,6 +121,8 @@
   * Update link to rack-jekyll on "Deployment Methods" page (#2047)
   * Fix typo in /docs/configuration (#2073)
   * Fix count in docs for `site.static_files` (#2077)
+  * Update configuration docs to indicate utf-8 is the default for 2.0.0
+    and ASCII for 1.9.3 (#2074)
 
 ## 1.4.3 / 2014-01-13