Merge branch 'latest' of github.com:webnotes/erpnext into latest

Conflicts: version.num
2012-02-07 10:59:29 +05:30
parent e00e70841c f35992f695
commit 67d2c8396c
27 changed files with 634 additions and 369 deletions
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-353
+359