From 1e6847c43ff73667eaa4c4d1776240cf0597efc9 Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Fri, 31 Jan 2014 08:48:16 -0600
Subject: [PATCH] Update history to reflect merge of #1982

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

diff --git a/History.markdown b/History.markdown
index 91e82fc5..b505f089 100644
--- a/History.markdown
+++ b/History.markdown
@@ -47,6 +47,7 @@
   * Lock Maruku at 0.7.0 to prevent bugs caused by Maruku 0.7.1 (#1958)
   * Fixes full path leak to source directory when using include tag (#1951)
   * Don't generate pages that aren't being published (#1931)
+  * Use `SafeYAML.load` to avoid conflicts with other projects (#1982)
 
 ### Development Fixes
   * Add a link to the site in the README.md file (#1795)