tree f49de8580506e1c3e2f6a4775e49db536b9ee71b
parent ccee92e5c049d09b0f2abeac9b626fa66bee71dd
parent f9360ce5627e810b9a0024f629dd512ed30bf473
author Anand Doshi <anand@iwebnotes.com> 1343736049 +0530
committer Anand Doshi <anand@iwebnotes.com> 1343736049 +0530

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

Conflicts:
	erpnext/hr/doctype/expense_claim/expense_claim.js
	erpnext/patches/patch_list.py