Update history to reflect merge of #1660

2013-10-25 10:00:05 -05:00 · 2013-10-25 10:00:05 -05:00 · 727a705d67
parent 4f8b6aaa7e
commit 727a705d67
1 changed files with 2 additions and 0 deletions
--- 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)