tree 7f5e6921390424e08c10b8de3ed642bdd02e082e
parent a5d19955d1dba159694670d61bfad92c30efdba7
parent deb31432ddc96932c757d1fe866f7532ce2db499
author Anand Doshi <anand@erpnext.com> 1366785174 +0530
committer Anand Doshi <anand@erpnext.com> 1366785174 +0530

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

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