Merge branch 'master' of https://github.com/odoo/odoo into master-odoo-cmd-fme
authorFabien Meghazi <fme@openerp.com>
Tue, 27 May 2014 07:35:37 +0000 (09:35 +0200)
committerFabien Meghazi <fme@openerp.com>
Tue, 27 May 2014 07:35:37 +0000 (09:35 +0200)

Trivial merge