From 727a705d67da70c8c64abbd785ce4449e1da8942 Mon Sep 17 00:00:00 2001
From: Matt Rogers <mattrogers@sbcglobal.net>
Date: Fri, 25 Oct 2013 10:00:05 -0500
Subject: [PATCH] Update history to reflect merge of #1660

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

diff --git a/History.markdown b/History.markdown
index cf414077..860a236c 100644
--- a/History.markdown
+++ b/History.markdown
@@ -30,6 +30,8 @@
   * Downgrade to Maruku `~> 0.6.0` in order to avoid changes in rendering (#1598)
   * Fix error with failing include tag when variable was file name (#1613)
   * Downcase lexers before passing them to pygments (#1615)
+  * Capitalize the short verbose switch because it conflicts with the
+    built-in Commander switch (#1660)
 
 ### Development Fixes
   * Add coverage reporting with Coveralls (#1539)