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

This commit is contained in:
Anand Doshi 2012-05-16 14:11:24 +05:30
commit 57599ebbae