[MERGE] merged with trunk
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Thu, 30 May 2013 15:55:09 +0000 (17:55 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Thu, 30 May 2013 15:55:09 +0000 (17:55 +0200)
commitfb2e5292d8c298fea7da13bdb35ca1526f9b954e
tree4ba77bf049f5c3188a04f7689a917ed8ba4b3c08
parent7583105139e90140c42a6cfc33550f4e67be37b2
parent0dc0d9f83c8db94b3679beb06b224242d4c695fd
[MERGE] merged with trunk

bzr revid: qdp-launchpad@openerp.com-20130530155509-myby6n73iefvcc19