tree 619b814f67e0d5bc87d99958990684af9be3d94f
parent 65d87555671618523bee5041b4ab9d2032e403ea
parent ded5da5b40db142ad67d50542423365dc27ec847
author Anand Doshi <anand@erpnext.com> 1369302767 +0530
committer Anand Doshi <anand@erpnext.com> 1369302767 +0530

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

Conflicts:
	accounts/doctype/sales_invoice_item/sales_invoice_item.txt
	selling/doctype/quotation/quotation.txt
	selling/doctype/quotation_item/quotation_item.txt
	selling/doctype/sales_order_item/sales_order_item.txt
	stock/doctype/delivery_note_item/delivery_note_item.txt
	stock/doctype/item/item.txt