From aa2cfc81b7d13bc87b090da4c7fa7f28fe3cefeb Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Thu, 8 Sep 2016 11:27:36 -0700
Subject: [PATCH] Update history to reflect merge of #5337 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 9ae9d018..952957ff 100644
--- a/History.markdown
+++ b/History.markdown
@@ -10,6 +10,7 @@
 
   * Use jekyll-feed to generate the default site's RSS feed (#5196)
   * Site#configure_theme: do not set theme unless it's a string (#5189)
+  * Convertible: set self.output in #render_all_layouts and #do_layout (#5337)
 
 ### Site Enhancements