merging 1.7.1 release into develop branch

This commit is contained in:
Vishwas Babu A J
2013-08-12 22:25:24 +05:30
26 changed files with 300 additions and 111 deletions
+5 -1
View File
@@ -1 +1,5 @@
releaseVersion=1.8.0.DEVELOP
<<<<<<< HEAD
releaseVersion=1.8.0.DEVELOP
=======
releaseVersion=1.7.1.RELEASE
>>>>>>> master