tree 4df6b3ce710fe33ec9e1d36a7acc0eedb7fc8dc4
parent ae1a91835e460822d1a09e41972461dc9b5658d5
parent b16474e606908f340c6f04c9aa0516714afa8bba
author Anand Doshi <anand@erpnext.com> 1439453433 +0530
committer Anand Doshi <anand@erpnext.com> 1439453433 +0530

Merge branch 'nabinhait-item_description' into develop

Conflicts:
	erpnext/patches.txt