[MERGE] trunk
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 30 Nov 2012 17:30:41 +0000 (18:30 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 30 Nov 2012 17:30:41 +0000 (18:30 +0100)
commit9fc63f9572dd17b778283e150720c8e2431a4874
treed3d6cac8fbf8a62728e267c9f6e0a2c8fa7509e9
parent56e72783ae62d288429ab426ce701c3efd404237
parenta1d79115e598549944a7cb793d258bfbd814d848
[MERGE] trunk

bzr revid: qdp-launchpad@openerp.com-20121130173041-iyvd47qushkbmenm