Merge branch '8.0' into 8.0-pos-imps2-fva
authorFrederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com>
Thu, 7 Aug 2014 12:59:26 +0000 (14:59 +0200)
committerFrederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com>
Thu, 7 Aug 2014 12:59:26 +0000 (14:59 +0200)

Trivial merge