tree bbfbb0276f2df7e3f57664ea46d72e8937066670
parent 84cd7e5c322b4bd27e3b9dfa97b3d4bd77aa7419
parent a5a747fd8d857fd3a284051668038fe3b001937e
author Anand Doshi <anand@iwebnotes.com> 1337086375 +0530
committer Anand Doshi <anand@iwebnotes.com> 1337086375 +0530

Merge branch 'shf_rename'

Conflicts:
	erpnext/patches/patch_list.py