Merge branch 'master' of github.com:webnotes/erpnext

Conflicts:
	version.num
This commit is contained in:
Anand Doshi
2012-03-02 12:21:01 +05:30
5 changed files with 13 additions and 9 deletions

View File

@@ -1 +1 @@
816
816