projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2889dd4 6af5da1)
[MERGE]: Merge with lp:openobject-server
authorrpa (Open ERP) <rpa@tinyerp.com>
Tue, 21 Sep 2010 13:21:34 +0000 (18:51 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Tue, 21 Sep 2010 13:21:34 +0000 (18:51 +0530)
bzr revid: rpa@tinyerp.com-20100921132134-eb51fo5ueaoqxy12


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