tree 8c17e7565cc082058f38ffacfe69838cec223cb8
parent 99100a4135f20a174073ecd32610a016ad6710a4
parent 37805ca4155bfd499c9b9ac38e6635dd727ecfd5
author Anand Doshi <anand@erpnext.com> 1372938525 +0530
committer Anand Doshi <anand@erpnext.com> 1372938525 +0530

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

Conflicts:
	selling/doctype/lead/lead.txt