projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 360afad ea0fc2f)
[MERGE] Merge with dev-addons3 branch
authorpsi (Open ERP) <psi@tinyerp.co.in>
Fri, 18 Jun 2010 08:50:13 +0000 (14:20 +0530)
committerpsi (Open ERP) <psi@tinyerp.co.in>
Fri, 18 Jun 2010 08:50:13 +0000 (14:20 +0530)
bzr revid: psi@tinyerp.co.in-20100618062748-q4n248ylkip9wbim
bzr revid: psi@tinyerp.co.in-20100618064323-5pxbo0m3ukhls94u
bzr revid: psi@tinyerp.co.in-20100618084546-yw7tmjxv3kt3gkvi
bzr revid: psi@tinyerp.co.in-20100618085013-lgin99tg4staqb6f


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