[MERGE] trunk
authoropenerp-sle <openerp-sle@openerp-sle.home>
Mon, 17 Feb 2014 15:36:01 +0000 (16:36 +0100)
committeropenerp-sle <openerp-sle@openerp-sle.home>
Mon, 17 Feb 2014 15:36:01 +0000 (16:36 +0100)
commit0b7351da20857d85641267da991299e5ff86aa90
tree7b689728b7f811f3841b58030c85032840c6936d
parent1e0d15e5ece4f8fa611c41198002c9d05ade825c
parent665e2629e272426293b90a7b554289231c8b4e10
[MERGE] trunk

bzr revid: openerp-sle@openerp-sle.home-20140217153601-75znvem3gez24ycs