MIFOSX-348: merge and fix conflict for bug fix.

This commit is contained in:
Keith Woodlock
2013-05-12 14:12:51 +01:00
8 changed files with 49 additions and 28 deletions
+1 -1
View File
@@ -1 +1 @@
releaseVersion=1.2.0.RELEASE
releaseVersion=1.2.0.RELEASE