[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Tue, 18 Feb 2014 17:01:53 +0000 (18:01 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Tue, 18 Feb 2014 17:01:53 +0000 (18:01 +0100)
commit611bd08bd7c4bf1ad9c9e4049df9e4f6d7d2a3b1
tree54a2751fa5351bc2db76067a457d733d9522f5a0
parent6fb94d91d08064f261ce103c756e75f78069f0aa
parent79a0a10f932ba0bbed094cf6bfb876f86d22c38f
[MERGE] from trunk

bzr revid: fva@openerp.com-20140218170153-1nnck8im4hdkrdr6