projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c8560f6 7290d58)
[MERGE] Merged with server/trunk.
authorThibault Delavallée <tde@openerp.com>
Tue, 14 Aug 2012 18:33:24 +0000 (20:33 +0200)
committerThibault Delavallée <tde@openerp.com>
Tue, 14 Aug 2012 18:33:24 +0000 (20:33 +0200)
bzr revid: tde@openerp.com-20120814183324-d2eza8ffbud1ewvn


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