[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Mon, 24 Feb 2014 17:28:22 +0000 (18:28 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Mon, 24 Feb 2014 17:28:22 +0000 (18:28 +0100)
commit0368f23b1eb72d933c1d8389518e366dd290004a
treef7a663e9d16bf0edfc9ccadff5ac36d57659f89f
parentb2c89c22bf4141f151e38a601ce0300405bff16b
parent5c08f38a1be3393e97d7aed31521087b71729a1c
[MERGE] from trunk

bzr revid: fva@openerp.com-20140224172822-ehn3xeb7rb1xro07