Merge branch 'refs/heads/develop'

Conflicts:
	version.py
This commit is contained in:
Ruud
2013-07-05 22:18:27 +02:00

View File

@@ -1,2 +1,2 @@
VERSION = '2.0.7'
VERSION = None
BRANCH = 'master'