tree b4fb789368c233aa55b6bec4b21271e26cda621a
parent 6420e602e0b1c741c6afaa783b9334f70ceeab32
parent cba9c716f21ee88e608bbffc542c22c74f66fedf
author Nabin Hait <nabinhait@gmail.com> 1337595501 +0530
committer Nabin Hait <nabinhait@gmail.com> 1337595501 +0530

Merge branch 'shf_rename'

Conflicts:
	erpnext/patches/patch_list.py