tree d3f38387931dd0e8f20c8fb4d112617e0c000b18
parent 1dde46aff00b2a401447219d09d350c650c46fe3
parent bad148a431f72786cd24ba8252ba0d1c81cb1193
author Anand Doshi <anand@erpnext.com> 1368632907 +0530
committer Anand Doshi <anand@erpnext.com> 1368632907 +0530

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

Conflicts:
	patches/patch_list.py