tree 914b7d187f3421615e6572162bed2499df9ad534
parent ed1679a1c523b0d3114650675cdd6982b437db1b
parent 3990104e9bf24b5e64b172771d4e5317e0ed7340
author Anand Doshi <anand@erpnext.com> 1383838476 +0530
committer Anand Doshi <anand@erpnext.com> 1383838476 +0530

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