tree 25285190e4fa068f01907c262cf465e433721503
parent a742d32c96ba577fd77f7986e1537521d1aae82d
parent f6624257ad9762506c4d1d91207177ad67b63185
author Anand Doshi <anand@iwebnotes.com> 1344332276 +0530
committer Anand Doshi <anand@iwebnotes.com> 1344332276 +0530

Merge branch 'master' of github.com:webnotes/erpnext into unicode

Conflicts:
	erpnext/stock/doctype/item/item.txt