[MERGE] trunk
authorAntony Lesuisse <al@openerp.com>
Mon, 2 Jul 2012 19:38:37 +0000 (21:38 +0200)
committerAntony Lesuisse <al@openerp.com>
Mon, 2 Jul 2012 19:38:37 +0000 (21:38 +0200)
commit24d20f03376545fa2238fd58ca59b3d170b89c17
tree12ef92f10dd8da28c89faf13cd64bbb8ce773a50
parent376af6f33f42cbdeb1f29a2e81f07983185b6d7d
parent38d7e1298ed7bb93f1a1ff9391192a9238c7cc1f
[MERGE] trunk

bzr revid: al@openerp.com-20120702193837-0ouwb27axvrbnq9f