projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9065642 595b9e2)
merge upstream
authorChristophe Simonis <chs@openerp.com>
Fri, 7 Dec 2012 10:42:59 +0000 (11:42 +0100)
committerChristophe Simonis <chs@openerp.com>
Fri, 7 Dec 2012 10:42:59 +0000 (11:42 +0100)
bzr revid: chs@openerp.com-20121206101346-y29ofn540ihmbvtt
bzr revid: chs@openerp.com-20121207104259-xy72g0rs6sdqtroz


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