projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 227709d 84d194d)
Merge remote-tracking branch 'odoo/master' into master-odoo-cmd-fme
authorFabien Meghazi <fme@openerp.com>
Fri, 30 May 2014 19:38:15 +0000 (21:38 +0200)
committerFabien Meghazi <fme@openerp.com>
Fri, 30 May 2014 19:38:15 +0000 (21:38 +0200)
Conflicts:
openerpcommand/common.py


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