tree dc167f7de7145ccb3c2ed2003d6663c8c8b187a5
parent 4058af24e299885295de738712885966e47ed748
parent 25dd38c8f2f777bb78ff8225a4aef5b2c7719f30
author Anand Doshi <anand@erpnext.com> 1461150780 +0530
committer Anand Doshi <anand@erpnext.com> 1461150780 +0530

Merge branch 'hotfix'