projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fdc5f02 18ba460)
[MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
authorrpa (Open ERP) <rpa@tinyerp.com>
Wed, 12 Jan 2011 05:20:56 +0000 (10:50 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Wed, 12 Jan 2011 05:20:56 +0000 (10:50 +0530)
bzr revid: rpa@tinyerp.com-20110112052056-19qrc933vhek1g4h


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