Merge remote-tracking branch 'remotes/upstream/master'

Conflicts: AUTHORS docs/changelog.rst
2015-10-18 01:28:50 -04:00
parent c1645ab7a7 79a2d715b0
commit 8e7c5af16c
4 changed files with 6 additions and 3 deletions
--- a/1
+++ b/1
@@ -229,3 +229,4 @@ that much better:
 * Emile Caron (https://github.com/emilecaron)
 * Amit Lichtenberg (https://github.com/amitlicht)
 * Gang Li (https://github.com/iici-gli)
+ * Lars Butler (https://github.com/larsbutler)