tree b429f40df03b50a66b75bd23e968ddbd9cb7fdec
parent 17fb35fa4a2e9c5d3781ec63763561f169369f73
parent fdeb55ba69def1564108b659aaef95c7ea243718
author Anand Doshi <anand@iwebnotes.com> 1336633858 +0530
committer Anand Doshi <anand@iwebnotes.com> 1336633858 +0530

Merge branch 'master' of github.com:webnotes/erpnext

Conflicts:
	erpnext/patches/patch_list.py