[MERGE] trunk
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Thu, 11 Oct 2012 07:56:58 +0000 (09:56 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Thu, 11 Oct 2012 07:56:58 +0000 (09:56 +0200)
commitce440f16d39d57f7a8bb49fc613c5e651991d905
tree79258a0eb42154d92a7fdd976eae8fba0de08b60
parent9298810c8801e9a25ad434e46ec395eacbd1b293
parentfc94df2af5146d2780da3b07bf1fad78e6831889
[MERGE] trunk

bzr revid: qdp-launchpad@openerp.com-20121011075658-bf5ax000j74vi6ro