tree 456fa4810aec4468be0bb89c07fe28220d539e76
parent ab7b7c2974b635d37f7b8d0f28cfa050566ec4e9
parent edf639b607bf7ceb2dc047f6dcd424dcdef62d04
author Anand Doshi <anand@erpnext.com> 1363608728 +0530
committer Anand Doshi <anand@erpnext.com> 1363608728 +0530

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

Conflicts:
	patches/patch_list.py