tree dab7cb6403379eeab724a009d9cf6df4d797a7b6
parent e2fe4cd31736a08d9c18ba6e7a2d5116ef5d007b
parent 890265928b88c880ae534f8c7df04f91d2d0956b
author Anand Doshi <anand@erpnext.com> 1366701138 +0530
committer Anand Doshi <anand@erpnext.com> 1366701138 +0530

Merge branch 'master' into edge

Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	stock/doctype/item/item.txt