From 98109d2e3977c8a43b57f60bebe3cf45052199c4 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 11 Mar 2014 11:10:32 -0400
Subject: [PATCH] Update history to reflect merge of #2122 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8cf92ba2..2f262362 100644
--- a/History.markdown
+++ b/History.markdown
@@ -94,6 +94,7 @@
   * Clean up the gemspec for the project (#2095)
   * Add Japanese translation of README and CONTRIBUTING docs. (#2081)
   * Re-align the tables in Cucumber (#2108)
+  * Trim trailing spaces and convert tabs to spaces (#2122)
 
 ### Site Enhancements
   * Document Kramdown's GFM parser option (#1791)