[MERGE] trunk
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Mon, 3 Jun 2013 09:43:10 +0000 (11:43 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Mon, 3 Jun 2013 09:43:10 +0000 (11:43 +0200)
commit8df1919dbb2beb650e7cd48213c52dbee87e690e
tree60c595e3859a70fbc4197d8cc17ff4fb8eb49874
parentc4f8b59c37819e0f7c6e74223f62ba790e4b8240
parent36c14f32d20e1d217d3a7231b9480a7ca426b449
[MERGE] trunk

bzr revid: qdp-launchpad@openerp.com-20130603094310-s9c46eliaifqttnx