Merge remote-tracking branch 'upstream/master'

This commit is contained in:
rupertbaxter2
2014-08-05 12:43:30 -07:00
3 changed files with 3 additions and 2 deletions

View File

@ -66,6 +66,7 @@ __authors__ = (
'Naglis Jonaitis',
'Charles Chen',
'Hassaan Ali',
'Dobrosław Żybort',
)
__license__ = 'Public Domain'