From 7baa56e1b2eaedee0ceca42d934bfeafe6f25be8 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sat, 30 Aug 2014 19:34:52 -0700
Subject: [PATCH] Update history to reflect merge of #2859 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 50c85e35..e6863724 100644
--- a/History.markdown
+++ b/History.markdown
@@ -17,6 +17,7 @@
   * Update simplecov gem to 0.9 (#2748)
   * Remove `docs/` dir (#2768)
   * add class `<< self` idiom to `New` command (#2817)
+  * Allow Travis to 'parallelize' our tests (#2859)
 
 ### Site Enhancements