Launchpad automatic translations update.
Launchpad automatic translations update.
Merge branch 'openobject-addons/7.0' into demo/7.0
Merge branch 'openerp-web/7.0' into demo/7.0