tree c0d67faa3f20f7a18104438b013c6dc2d54d48f5
parent 44f777eeecd8bb88ad50e79abdfa1b3e004afd76
parent b5b3d478a2cfa5392577cbb2b5269af3e907ad93
author Anand Doshi <anand@erpnext.com> 1457361054 +0530
committer Anand Doshi <anand@erpnext.com> 1457361054 +0530

Merge branch 'emakis-in_words_configurable' into develop