Merge branch 'master' of https://github.com/odoo/odoo master
authorSébastien CHAZALLET <s.chazallet@gmail.com>
Thu, 11 Dec 2014 10:43:25 +0000 (11:43 +0100)
committerSébastien CHAZALLET <s.chazallet@gmail.com>
Thu, 11 Dec 2014 10:43:25 +0000 (11:43 +0100)
commitfcd06145dda957a83e687fd033ff294c407da5f4
tree7dc0607cc5481178fd3b926f5213137b7ece870d
parentd9610efd979c974e540353716f8d0b9ecdb9d952
parentb69c45912642e088e30dc3f02727dd3c295bf9b0
Merge branch 'master' of https://github.com/odoo/odoo