Anand Doshi dc0f2d2422 Merge branch 'master' into edge
Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	stock/doctype/item/item.txt
2013-04-23 12:42:18 +05:30
..
2013-04-23 12:42:18 +05:30
2013-04-16 12:29:27 +05:30
2013-02-27 17:36:23 +01:00
2013-02-22 17:54:50 +05:30
2013-01-16 17:48:17 +05:30
2013-03-19 18:29:05 +05:30
2013-03-28 16:40:30 +05:30