projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bf7727c 89e9a7d)
[merge]
authorniv-openerp <nicolas.vanhoren@openerp.com>
Wed, 15 Jun 2011 12:31:15 +0000 (14:31 +0200)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Wed, 15 Jun 2011 12:31:15 +0000 (14:31 +0200)
bzr revid: nicolas.vanhoren@openerp.com-20110614153404-8bf2i7yc5g050s1i
bzr revid: nicolas.vanhoren@openerp.com-20110615123115-li2ikbhgjpfleelu


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