Merge remote-tracking branch 'upstream/master' into features

This commit is contained in:
Bruno Oliveira
2016-09-01 23:07:49 -03:00
29 changed files with 205 additions and 80 deletions

View File

@@ -1,2 +1,2 @@
#
__version__ = '3.1.0.dev'
__version__ = '3.1.0.dev0'