Merge remote-tracking branch 'odoo/master' into master-sass-in-bundles-fme
authorFabien Meghazi <fme@openerp.com>
Thu, 19 Jun 2014 16:39:56 +0000 (18:39 +0200)
committerFabien Meghazi <fme@openerp.com>
Thu, 19 Jun 2014 16:39:56 +0000 (18:39 +0200)
commit52ee6c52bd1b160b8b29228df15333cf09c5aa5e
tree4d4648c7e87eaec9467940846536301e465e357b
parent146d7b2886afaee2d54e6d903b89c1c948db1365
parent981362b2d843da6fd031fefabd20c99bdd47b4c6
Merge remote-tracking branch 'odoo/master' into master-sass-in-bundles-fme