tree b0af8bd923f2e911b1fb1a708ec773c259db0dc4
parent 654f6bfa854d5549076085cee84d18ebd370dc4b
parent af0ced2ba7db34794a35342b70459c8d710adc8a
author Anand Doshi <anand@iwebnotes.com> 1334213901 +0530
committer Anand Doshi <anand@iwebnotes.com> 1334213901 +0530

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

Conflicts:
	version.num