Merge branch '8.0' of github.com:odoo/odoo into 8.0
authorFabien Pinckaers <fp@openerp.com>
Wed, 20 Aug 2014 17:38:59 +0000 (19:38 +0200)
committerFabien Pinckaers <fp@openerp.com>
Wed, 20 Aug 2014 17:38:59 +0000 (19:38 +0200)
commitfee5701359ab2d11fe40989e5ce8441921fc63ee
treede10b09031bd40270cd728228baeee5578e731c8
parent76a84ce2bf90ba955fce32431f4a255a243c2edc
parentc48a7141e6a3756694e2dad1ab50677da8084917
Merge branch '8.0' of github.com:odoo/odoo into 8.0