projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 77723f0 df75edb)
Merge remote-tracking branch 'odoo/master' into master-watchdog-fme
authorFabien Meghazi <fme@openerp.com>
Mon, 4 Aug 2014 15:07:03 +0000 (17:07 +0200)
committerFabien Meghazi <fme@openerp.com>
Mon, 4 Aug 2014 15:07:03 +0000 (17:07 +0200)

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