tree c37ea5045ca3d5ee95b6f2e9dc51d67e0bb45004
parent 85eb840ab43d861fcd755a5da82351c55a51d96a
parent 3525d92cfbc0bc9c9fe28decc6626e72f9f427d0
author Anand Doshi <anand@iwebnotes.com> 1333953893 +0530
committer Anand Doshi <anand@iwebnotes.com> 1333953893 +0530

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

Conflicts:
	erpnext/accounts/doctype/c_form/c_form.txt
	erpnext/patches/patch_list.py
	erpnext/setup/doctype/permission_control/permission_control.py