tree 117553b8bce22047248e09cd5922ae7948ec2dd7
parent 390b788e7b8e33c50414dcc1f1b53e42bd14e821
parent 252a7a189bf18661af4ea90c19b8a5a837d663ea
author Anand Doshi <anand@iwebnotes.com> 1338901637 +0530
committer Anand Doshi <anand@iwebnotes.com> 1338901637 +0530

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

Conflicts:
	erpnext/selling/doctype/lead/lead.js
	erpnext/setup/doctype/contact_control/contact_control.js