Merge remote-tracking branch 'odoo/saas-4' into saas-4-speakers-rim
authorRichard Mathot <rim@openerp.com>
Wed, 21 May 2014 15:11:58 +0000 (17:11 +0200)
committerRichard Mathot <rim@openerp.com>
Wed, 21 May 2014 15:11:58 +0000 (17:11 +0200)
commitfbdc29459fdd9e5efe08d64ab788557af2a015e5
tree9242f9911b5246baad130eb6c1314361717f1b99
parent37d6fe344b3735f6b33f32cb8a1322cc3d9fc39d
parent9d1e0be2e9406c12d5cc0fcfbd04152f558a9619
Merge remote-tracking branch 'odoo/saas-4' into saas-4-speakers-rim