tree 341a50bb4f1f30298cc6a57f9bae03e8c148208a
parent 9fdee387ea6ddeba348830a49001b83bc8a1bd9e
parent 685564f71d312260cfbc5cd2fc7e89e888d3a782
author Anand Doshi <anand@iwebnotes.com> 1325571311 +0530
committer Anand Doshi <anand@iwebnotes.com> 1325571311 +0530

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

Conflicts:
	erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt