projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70aaca0 104cde3)
[MERGE]: Merge with lp:openobject-server
authorrpa (Open ERP) <rpa@tinyerp.com>
Thu, 9 Sep 2010 05:32:30 +0000 (11:02 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Thu, 9 Sep 2010 05:32:30 +0000 (11:02 +0530)
bzr revid: rpa@tinyerp.com-20100908051704-ndbu7ewdzap55ua7
bzr revid: hmo@tinyerp.com-20100908113129-0rud31cdpv42yfa6
bzr revid: rpa@tinyerp.com-20100909053230-ycmnc0k96dedyjq6


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