tree a49be5fad3873c5379de48ad2417b0b9633ecde5
parent 79fe5a15428c80d5705c0b8aeece1c7ccd270441
parent 97ae17eaf7ac5d4acde7faa81ba8a3a43305cf80
author Anand Doshi <anand@iwebnotes.com> 1334297915 +0530
committer Anand Doshi <anand@iwebnotes.com> 1334297915 +0530

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

Conflicts:
	version.num