[MERGE] opw 17601
authorRaphael Collet <rco@openerp.com>
Mon, 3 Oct 2011 12:34:33 +0000 (14:34 +0200)
committerRaphael Collet <rco@openerp.com>
Mon, 3 Oct 2011 12:34:33 +0000 (14:34 +0200)
commit18faa34af7a81f504020e1faa1f5e63ed35aa1df
tree160f8995fc89e0e8405953c9b61d7015fe4f2f9a
parenta8583488913174ca09da5caf25ff29e12cae12a2
parent482fe03a9a825346d081ab18ec15c6470b0400a1
[MERGE] opw 17601

bzr revid: rco@openerp.com-20111003123433-zee3qglolfh713k1