From 2e2563fab90e38e676afec5d1f2f6f7ece2a4f8e Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 8 Feb 2014 00:34:16 -0500
Subject: [PATCH] Update history to reflect merge of #2015 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 24f08122..9bbfac67 100644
--- a/History.markdown
+++ b/History.markdown
@@ -102,6 +102,7 @@
   * Add `vim-jekyll` to the list of Editor plugins (#2005)
   * Fix non-semantic nesting of `p` tags in `news_item` layout (#2013)
   * Document destination folder cleaning (#2016)
+  * Updated instructions for NearlyFreeSpeech.NET installation (#2015)
 
 ## 1.4.3 / 2014-01-13