[MERGE] trunk
authoropenerp-sle <openerp-sle@openerp-sle.home>
Mon, 17 Feb 2014 09:49:35 +0000 (10:49 +0100)
committeropenerp-sle <openerp-sle@openerp-sle.home>
Mon, 17 Feb 2014 09:49:35 +0000 (10:49 +0100)
commitf703a4bb350530f09436231ac6683fc65a899fd8
treec45d38a23ba7e6756d7ad4d20f3cf56a5b314063
parent4a65881e24c1415ac800343ba878f8240505ea08
parent91b1c8472f9013ee719a71917761b3f109afebeb
[MERGE] trunk

bzr revid: openerp-sle@openerp-sle.home-20140217094935-1vow2td4pxb6wq3x