From 4f1708092923cd73bf2994e28167b01244fbd2f7 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 6 May 2014 16:31:04 -0400
Subject: [PATCH] Update history to reflect merge of #2309 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index e2004dfc..1122e33f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -105,6 +105,7 @@
   * Avoid duplicated output using `highlight` tag (#2264)
   * Only use Jekyll.logger for output (#2307)
   * Close the file descriptor in `has_yaml_header?` (#2310)
+  * Add `output` to `Document` liquid output hash (#2309)
 
 ### Development Fixes
   * Add a link to the site in the README.md file (#1795)
@@ -221,6 +222,7 @@
   * Add 2.0.0 release post (#2298)
   * Add docs for custom markdown processors (#2298)
   * Add docs for `where` and `group_by` Liquid filters (#2298)
+  * Remove notes in docs for unreleased features (#2309)
 
 ## 1.5.1 / 2014-03-27