Merge branch 'refs/heads/develop'

Conflicts:
	version.py
This commit is contained in:
Ruud committed 2013-01-24 23:35:37 +01:00
commit d27d0abeb0
4 files changed
+6 -3

No files matched your search

+1 -1
View File
@@ -1,2 +1,2 @@
VERSION = '2.0.1.1'
VERSION = '2.0.6'
BRANCH = 'master'