From da8571beecc19ee685dc2dc73ef0d401e3e0c566 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 26 Dec 2013 15:23:28 -0500
Subject: [PATCH] Update history to reflect merge of #1879

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

diff --git a/History.markdown b/History.markdown
index 2326e67f..77f180d2 100644
--- a/History.markdown
+++ b/History.markdown
@@ -19,6 +19,7 @@
   * Better error message when time is not parseable (#1847)
   * Allow `include` tag variable arguments to use filters (#1841)
   * `post_url` tag should raise `ArgumentError` for invalid name (#1825)
+  * Bump dependency `mercenary` to `~> 0.2.0` (#1879)
 
 ### Bug Fixes
   * Don't allow nil entries when loading posts (#1796)