tree 06fc3173e9d08d84b6b203540f72d273430c15c0
parent 1ba4bd4485d1808fed0ec51e8f2f6b48c75aae53
parent 6435437e5b9a199eec8ea3737966c1a430f9d658
author Anand Doshi <anand@erpnext.com> 1355936280 +0530
committer Anand Doshi <anand@erpnext.com> 1355936280 +0530

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

Conflicts:
	accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
	buying/doctype/purchase_order_item/purchase_order_item.txt
	buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
	patches/patch_list.py