projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 09d5302 4922c53)
[MERGE] upstream
authorFabien Meghazi <fme@openerp.com>
Tue, 13 May 2014 14:00:27 +0000 (16:00 +0200)
committerFabien Meghazi <fme@openerp.com>
Tue, 13 May 2014 14:00:27 +0000 (16:00 +0200)

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