tree b9a925fc6dca6140b92031eceb0aa0c0c9b5b4cc
parent 8456eabed8b415d123cfa9c1de26f7574702649b
parent f08cbe185dd349d7449d6ee53cfcc1f6a2c22aa0
author Anand Doshi <anand@iwebnotes.com> 1344583728 +0530
committer Anand Doshi <anand@iwebnotes.com> 1344583728 +0530

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

Conflicts:
	erpnext/setup/doctype/company/company.txt