From 404332ae359d4cc853152242f3f046c7715e6efb Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Sun, 14 Jul 2013 13:53:45 -0500
Subject: [PATCH] Update history to reflect merge of #1304

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

diff --git a/History.markdown b/History.markdown
index cfec4072..878eead4 100644
--- a/History.markdown
+++ b/History.markdown
@@ -79,6 +79,8 @@
   * Update the S3 deployment documentation (#1294)
   * Add suggestion for Xcode CLT install to troubleshooting page in docs (#1296)
   * Add 'Working with drafts' page to docs (#1289)
+  * Add information about time zones to the documentation for a page's
+    date (#1304)
 
 ## 1.0.3 / 2013-06-07