tree e998b1b078af1c9e240ccecb29dbd89de2f101b3
parent 8ee5498fe0ebc2c3b25d1e9b208e727742118098
parent 81b8627250d52dfcee8557d3d5ef0f6f4799ec85
author Anand Doshi <anand@erpnext.com> 1450170431 +0530
committer Anand Doshi <anand@erpnext.com> 1450170431 +0530

Merge branch 'ShashaQin-patch-60' into develop