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)

Trivial merge