From 722892cd960a1ba6b2f9c456bee2fbddb62c4f54 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 24 Mar 2014 21:43:00 -0400
Subject: [PATCH] Update history with 1.5.0 release. [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 6aa0428e..86133d9d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -157,6 +157,22 @@
   * Add `jekyll_figure` to list of third-party plugins (#2158)
   * Clarify the documentation for safe mode (#2163)
 
+## 1.5.0 / 2014-03-24
+
+### Minor Enhancements
+
+  * Loosen `safe_yaml` dependency to `~> 1.0` (#2167)
+  * Bump `safe_yaml` dependency to `~> 1.0.0` (#1942)
+
+### Bug Fixes
+
+  * Fix issue where filesystem traversal restriction broke Windows (#2167)
+  * Lock `maruku` at `0.7.0` (#2167)
+
+### Development Fixes
+
+  * Lock `cucmber` at `1.3.11` (#2167)
+
 ## 1.4.3 / 2014-01-13
 
 ### Bug Fixes