[MERGE] lp:872680
authorRaphael Collet <rco@openerp.com>
Tue, 8 Nov 2011 16:00:17 +0000 (17:00 +0100)
committerRaphael Collet <rco@openerp.com>
Tue, 8 Nov 2011 16:00:17 +0000 (17:00 +0100)
commitfe742469cd37c2b828d153b8c1f0ef9546ca69cd
tree5ec37077fed7c3cedda0447a0753c5437ae27ad3
parent60b7b6e10c0d77b183d31867742ab72809599443
parentf79f94ea0058f95721aab4331b42803691042c0e
[MERGE] lp:872680

bzr revid: rco@openerp.com-20111108160017-dxy7ff113j0teunh