tree 404dc83a8d662856800ac82a14b1c77fb9a2744a
parent b4892971081408581d50817376ca56756a502dfe
parent fddb782a82f4422ac8714b4d00f23c7b4b6bb542
author Anand Doshi <anand@iwebnotes.com> 1333015277 +0530
committer Anand Doshi <anand@iwebnotes.com> 1333015277 +0530

Merge branch 'renamedt' into shf_rename

Conflicts:
	erpnext/patches/patch_list.py