tree 4d4249194730f8145ecc339e37c57e6820f2fccb
parent 73fd765d55c4c8fd1d5dc41f37d2cd18545c5796
parent 6b52d77c7626ce59b450313b0687d20f5e5fd5d2
author Anand Doshi <anand@iwebnotes.com> 1347945406 +0530
committer Anand Doshi <anand@iwebnotes.com> 1347945406 +0530

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

Conflicts:
	erpnext/setup/doctype/email_digest/email_digest.py