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

Conflicts:
	version.num
This commit is contained in:
Anand Doshi
2012-04-12 12:28:21 +05:30
3 changed files with 7 additions and 7 deletions

View File

@@ -1 +1 @@
1667
1667