[MERGE] trunk
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Mon, 17 Dec 2012 11:06:01 +0000 (12:06 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Mon, 17 Dec 2012 11:06:01 +0000 (12:06 +0100)
commitd5a38257ead84e99d905e99f90e0b4ca174cc6c8
tree163837122175518aa4454143665e701201067460
parentf9e227717e30d2ef5b9d62ddcb2c6d934991a7cb
parenta7ddf7c6895dedfafe6e40b005b7a53512f32cfb
[MERGE] trunk

bzr revid: qdp-launchpad@openerp.com-20121217110601-z27qffjgh164jgxf