| commit | cd447b2ae59d3d32c56f4267c874d2b6203d0408 | [log] [tgz] |
|---|---|---|
| author | Anand Doshi <anand@iwebnotes.com> | Mon Mar 05 14:37:26 2012 +0530 |
| committer | Anand Doshi <anand@iwebnotes.com> | Mon Mar 05 14:37:26 2012 +0530 |
| tree | 7487bd3e37d6c702cb60d4ef60b8f46f0e646e2f | |
| parent | 6a39ab1661b21b0813557fd98ddd49b61060faed [diff] [blame] | |
| parent | d14bea3de5d63ef3e0e458ea16e27a5c93d82f48 [diff] [blame] |
Merge branch 'master' into sync Conflicts: version.num
diff --git a/version.num b/version.num index 5cd7ca2..b3fa96d 100644 --- a/version.num +++ b/version.num
@@ -1 +1 @@ -748 \ No newline at end of file +819