projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 26ef6d1 96cd88b)
[MERGE] trunk
authorAntonin Bourguignon <abo@openerp.com>
Mon, 3 Dec 2012 13:34:55 +0000 (14:34 +0100)
committerAntonin Bourguignon <abo@openerp.com>
Mon, 3 Dec 2012 13:34:55 +0000 (14:34 +0100)
bzr revid: abo@openerp.com-20121203133455-81ewscuz0o94helo


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