Fix conflict for merge PR #726

2014-08-20 11:05:53 -05:00
parent f066e28c35 1c5898d396
commit 9f8cd33d43
4 changed files with 7 additions and 2 deletions
--- a/1
+++ b/1
@@ -207,3 +207,4 @@ that much better:
 * Bruno Rocha (https://github.com/rochacbruno)
 * Norberto Leite (https://github.com/nleite)
 * Bob Cribbs (https://github.com/bocribbz)
+ * Jay Shirley (https://github.com/jshirley)