projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41abe40 1c289b7)
merge trunk
authorniv-openerp <nicolas.vanhoren@openerp.com>
Mon, 4 Jun 2012 08:55:51 +0000 (10:55 +0200)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Mon, 4 Jun 2012 08:55:51 +0000 (10:55 +0200)
bzr revid: nicolas.vanhoren@openerp.com-20120604085551-fjj6edya9dyijmbr


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