tree 2e5eb255d80731a227141138e6942ccfc791a2e8
parent f1353e231de51432f7e6bef19c071e7207983ccf
parent c65061650967f18518d74af7420d42b86ec363da
author Brahma K <tobrahma@yahoo.com> 1311837102 +0530
committer Brahma K <tobrahma@yahoo.com> 1311837102 +0530

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

Conflicts:
	accounts/search_criteria/lease_agreement_list/lease_agreement_list.txt
	accounts/search_criteria/lease_receipt_summary_month_wise/lease_receipt_summary_month_wise.txt
	accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.txt