[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Thu, 20 Mar 2014 13:40:17 +0000 (14:40 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Thu, 20 Mar 2014 13:40:17 +0000 (14:40 +0100)
commit559641390143fc3457f531aa44d795ce41f85d60
treef206a4e8d92012bb1607d38bfba6ee9e0f0be8b3
parent53f02309ed9fbd85e58c49f10ed0843c10b5c486
parent520e10d4b469f7e18cad701887832ffec91dc1b0
[MERGE] from trunk

bzr revid: fva@openerp.com-20140320134017-wi6qdofziia3q12l