tree e15827857eb61d8a4b2556d9c05212028443c32a
parent aacbe7a2773c6dd888d9c3b77fa30b2b8a7d8bde
parent ce7ed98e3132d7aa0323a050ae2e713ad1b626ca
author Anand Doshi <anand@erpnext.com> 1383838838 +0530
committer Anand Doshi <anand@erpnext.com> 1383838838 +0530

Merge branches '1310' and 'master' of github.com:webnotes/erpnext