Merge remote-tracking branch 'upstream/master'

This commit is contained in:
rupertbaxter2 2014-08-06 16:43:21 -07:00
commit 0c72eb9060
4 changed files with 61 additions and 2 deletions

View file

@ -67,6 +67,7 @@ __authors__ = (
'Charles Chen',
'Hassaan Ali',
'Dobrosław Żybort',
'David Fabijan',
)
__license__ = 'Public Domain'