tree 57e69823e941a7a7c9014f8a9b1dbd08359b4318
parent 10a209d405bdc6e5e9b193919b8a5013dd48dbc3
parent 787c02ee42d0926fa941de5e80c20f5919d1597a
author Anand Doshi <anand@erpnext.com> 1364555876 +0530
committer Anand Doshi <anand@erpnext.com> 1364555876 +0530

Merge branch 'aii_release' of github.com:webnotes/erpnext into aii_release