From 657b6b328cdb270894120cd68e46e4b87af9f017 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Mon, 4 Jan 2016 16:26:02 -0800
Subject: [PATCH] Update history to reflect merge of #4307

[ci skip]
---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 715b8bc3..343dc08c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -32,6 +32,7 @@
   * Convertible/Page/Renderer: use payload hash accessor & setter syntax for backwards-compatibility (#4311)
   * Drop: fix hash setter precendence (#4312)
   * utils: `has_yaml_header?` should accept files with extraneous spaces (#4290)
+  * Escape html from site.title and page.title in site template (#4307)
 
 ### Development Fixes