From 68907ab833c80db7138214d2b6195c7aa5e2a5e7 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 14 Apr 2015 11:51:40 -0700
Subject: [PATCH] Update history to reflect merge of #3655 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 4aea0dbc..e88692a3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -12,6 +12,7 @@
   * Mimic GitHub Pages `.html` extension stripping behavior in WEBrick (#3452)
   * Always include file extension on output files (#3490)
   * Improved permalinks for pages and collections (#3538)
+  * Sunset (i.e. remove) Maruku (#3655)
 
 ### Minor Enhancements