tree b6bdc87fd622d03138b641542bdaa7c4cc2a8a3f
parent c13727adba7cb03b1702d865e2ed272826c68bcf
parent 4cc94df7523a39d92e4e727e5ba3ae0544ae88ac
author Anand Doshi <anand@erpnext.com> 1407479212 +0530
committer Anand Doshi <anand@erpnext.com> 1407479212 +0530

Merge branch 'rmehta-microtemplate-fixes' into develop