Merge branch 'master' into develop

This commit is contained in:
hugovk 2015-09-05 10:19:20 +03:00
commit d1958ab8fd
3 changed files with 7 additions and 4 deletions

View file

@ -32,7 +32,7 @@ import warnings
import re
import six
__version__ = '1.3.0'
__version__ = '1.4.0'
__author__ = 'Amr Hassan, hugovk'
__copyright__ = "Copyright (C) 2008-2010 Amr Hassan, 2013-2015 hugovk"
__license__ = "apache2"