| commit | 176526e9336f3ea283f24e3abaa41b90c20a749f | [log] [tgz] |
|---|---|---|
| author | Anand Doshi <anand@erpnext.com> | Wed May 22 12:23:13 2013 +0530 |
| committer | Anand Doshi <anand@erpnext.com> | Wed May 22 12:23:13 2013 +0530 |
| tree | 60cf22c591c4443cc05300e31efc2ef19b2467aa | |
| parent | 96e4de3aac594416552d80467a604bd123bd0da9 [diff] | |
| parent | ace9cbad9ecbc7947b2a2831580a001cc9f8ede7 [diff] |
Merge branch 'master' into edge