projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 55af2a1 9289a26)
[MERGE] Rebasing with trunk
authorRichard Mathot (OpenERP) <rim@openerp.com>
Fri, 7 Feb 2014 10:59:25 +0000 (11:59 +0100)
committerRichard Mathot (OpenERP) <rim@openerp.com>
Fri, 7 Feb 2014 10:59:25 +0000 (11:59 +0100)
bzr revid: rim@openerp.com-20140207105925-qn9z5xecpabgttsv


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