From 74fb4aca1616fb8c907357505bcfbfd4072c0277 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Mon, 25 Jan 2016 15:49:23 -0800
Subject: [PATCH] Update history to reflect merge of #4401 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 28c16468..15cda096 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,3 +1,9 @@
+## HEAD
+
+### Development Fixes
+
+  * Renderer#output_ext: honor folders when looking for ext (#4401)
+
 ## 3.1.0 / 2016-01-23
 
 ### Minor Enhancements