From 499b83236c0289471118991bd5fe743effe9b348 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Wed, 15 Jun 2016 12:42:08 -0700
Subject: [PATCH] Update history to reflect merge of #5014 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index dfd86789..acabb83d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -29,6 +29,7 @@
   * markdownify and smartify should convert input to string before conversion (#4958)
   * Run Site#generate for 'jekyll doctor' to catch plugin issues (#5005)
   * Add normalize_whitepace filter (#4917)
+  * Move bin/jekyll to exe/jekyll to prevent collision with binstubs (#5014)
 
 ### Bug Fixes