Anand Doshi 16ad50f641 Merge branch 'master' of github.com:webnotes/erpnext into unicode
Conflicts:
	erpnext/stock/doctype/item/item.txt
2012-08-07 15:07:56 +05:30
..