From d6ecb5025a2d3586dc1079a3753cf11debb9c76b Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 21 Feb 2014 18:21:32 -0500
Subject: [PATCH] Update history to reflect merge of #2085 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b31b7df6..41a22611 100644
--- a/History.markdown
+++ b/History.markdown
@@ -45,6 +45,7 @@
   * Make the `layouts` config key relative to CWD or to source (#2058)
   * Update Kramdown to `~> 1.3` (#1894)
   * Remove unnecessary references to `self` (#2090)
+  * Update to Mercenary v0.3.x (#2085)
 
 ### Bug Fixes
   * Don't allow nil entries when loading posts (#1796)