tree 09edacd8e674522639ab0c93296e52d17638cf84
parent 3d1f01ffc1aaa26cddfc5ad805178e744c9fe24c
parent 9a933788bee9270cba85f2d0d335fb99c00a4c8d
author Anand Doshi <anand@erpnext.com> 1455616831 +0530
committer Anand Doshi <anand@erpnext.com> 1455616831 +0530

Merge branch 'ShashaQin-patch-25' into develop