projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d65e16 f58465f)
[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Tue, 25 Sep 2012 14:11:40 +0000 (16:11 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Tue, 25 Sep 2012 14:11:40 +0000 (16:11 +0200)
bzr revid: fva@openerp.com-20120924150127-uky1tz5g8ecnvqs2
bzr revid: fva@openerp.com-20120925141140-oe20lwnxjzmdqctx


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