[MERGE] odoo command: scaffold, start, deploy
authorAntony Lesuisse <al@openerp.com>
Tue, 3 Jun 2014 17:44:20 +0000 (19:44 +0200)
committerAntony Lesuisse <al@openerp.com>
Tue, 3 Jun 2014 17:44:20 +0000 (19:44 +0200)

Trivial merge