tree 817272e91a6bc1a1e79cc4a89d160aefcccc0318
parent 66f90687e970cf113a10a814f2b9df09abc7cfbb
parent 85632b71c9f88f7f45369a1e457b90eb4847d4b1
author Anand Doshi <anand@iwebnotes.com> 1343380524 +0530
committer Anand Doshi <anand@iwebnotes.com> 1343380524 +0530

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

Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
	erpnext/patches/patch_list.py