tree e7889ef1762ceb891edefa529cfa66c876ff1028
parent b211a41547f9296e79d973e5bbfda9e2f803c245
parent 41cd5a68f4099ad955f8dbee54655cf0154762cb
author Anand Doshi <anand@iwebnotes.com> 1346412404 +0530
committer Anand Doshi <anand@iwebnotes.com> 1346412404 +0530

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

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