tree 9484b9846499edff1e11b0fb14f4cdcd919cf000
parent a3851758bf5b195d3f19eae81a777e65a96e258e
parent 4602ef39e33b959db0b6b4cd4e9ffb35410a89b2
author Anand Doshi <anand@iwebnotes.com> 1336980209 +0530
committer Anand Doshi <anand@iwebnotes.com> 1336980209 +0530

Merge branch 'shf_rename'

Conflicts:
	erpnext/patches/patch_list.py