tree fae148ab495a017457145d6c5849d2e9487b3a21
parent bab17a9a1f3a96b8cb6adb80b2bcf840768a60c3
parent 19acce9fa1dc90769d81ab0d2b80cd13209fbfbe
author Anand Doshi <anand@erpnext.com> 1364570016 +0530
committer Anand Doshi <anand@erpnext.com> 1364570016 +0530

Merge branch 'aii_release' into edge