From ae584e43ed11467290ab40b8557c77c07db17feb Mon Sep 17 00:00:00 2001
From: Alfred Xing <alfredxing@users.noreply.github.com>
Date: Fri, 1 May 2015 09:31:14 -0700
Subject: [PATCH] Update history to reflect merge of #3683 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index bd6d99fc..517f9fed 100644
--- a/History.markdown
+++ b/History.markdown
@@ -187,6 +187,7 @@
   * Showing how to access specific data items (#3468)
   * Clarify pagination works from within HTML files (#3467)
   * Add note to `excerpt_separator` documentation that it can be set globally (#3667)
+  * Fix some names on Troubleshooting page (#3683)
 
 ## 2.5.3 / 2014-12-22