projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 308dc4c cfb22c6)
[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Fri, 28 Sep 2012 04:18:56 +0000 (09:48 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Fri, 28 Sep 2012 04:18:56 +0000 (09:48 +0530)
bzr revid: mdi@tinyerp.com-20120927121603-jbd16j0jdjlkdyfm
bzr revid: mdi@tinyerp.com-20120928041856-32cseh83qy3heyfz


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.