tree 5822f5e09e2bd844659e90addc92c3dbb6ac08ec
parent 297f37da03b2ae33d68b4f147b63060abf7323e9
parent 6db2ac51e6440f24c1a5c8f72b224d5494698277
author Anand Doshi <anand@iwebnotes.com> 1345715798 +0530
committer Anand Doshi <anand@iwebnotes.com> 1345715798 +0530

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

Conflicts:
	erpnext/patches/patch_list.py