From 5b50687e221beb58e7f8cf9b38524d017242f72a Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 13 Jan 2015 12:01:11 -0800
Subject: [PATCH] Update history to reflect merge of #3299 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index d6b943df..5f344c3f 100644
--- a/History.markdown
+++ b/History.markdown
@@ -21,6 +21,7 @@
 
 ### Bug Fixes
 
+  * `time()`pre-filter method should accept a `Date` object (#3299)
   * Remove unneeded end tag for `link` in site template (#3236)
   * Kramdown: Use `enable_coderay` key instead of `use_coderay` (#3237)
   * Unescape `Document` output path (#2924)