From 09b5477856d90ef02ac93f9730bef156c4a439f8 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Wed, 2 Oct 2013 21:07:40 +0000
Subject: [PATCH] Update history to reflect merge of #1598

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

diff --git a/History.markdown b/History.markdown
index 98c2f329..2a1f03c5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -16,6 +16,7 @@
   * Fix the missing `pathname` require in certain cases (#1255)
   * Use `+` instead of `Array#concat` when building `Post` attribute list (#1571)
   * Print server address when launching a server (#1586)
+  * Downgrade to Maruku `~> 0.6.0` in order to avoid changes in rendering (#1598)
 
 ### Development Fixes
   * Add coverage reporting with Coveralls (#1539)