Merge branch 'refs/heads/develop' into desktop

Conflicts:
	version.py
This commit is contained in:
Ruud
2012-05-14 22:00:02 +02:00
+1 -1
View File
@@ -1 +1 @@
VERSION = '0.5'
VERSION = '2.0.0-pre1'