Merge branch 'refs/heads/develop' into desktop

Conflicts:
	version.py
This commit is contained in:
Ruud
2013-01-23 22:57:07 +01:00
+1 -1
View File
@@ -1,2 +1,2 @@
VERSION = '2.0.5'
VERSION = '2.0.6'
BRANCH = 'desktop'