projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91edca6 c3bbd5c)
[MERGE] merged with main trunk
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 9 Dec 2011 16:21:39 +0000 (17:21 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 9 Dec 2011 16:21:39 +0000 (17:21 +0100)
bzr revid: qdp-launchpad@openerp.com-20111209162139-9siz7s4akq3wlyhb


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.