Merge branch 'refs/heads/develop'

Conflicts:
	version.py
This commit is contained in:
Ruud
2012-09-16 10:46:39 +02:00
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -1,2 +1,2 @@
VERSION = '2.0.0.pre1'
VERSION = '2.0.0.pre2'
BRANCH = 'master'