Merge branch 'refs/heads/develop'

Conflicts:
	version.py
This commit is contained in:
Ruud
2013-01-24 23:35:37 +01:00
4 changed files with 6 additions and 3 deletions
+1 -1
View File
@@ -1,2 +1,2 @@
VERSION = '2.0.1.1'
VERSION = '2.0.6'
BRANCH = 'master'