projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 047b10f c05b34c)
[MERGE] trunk
authorThibault Francois <tfr@openerp.com>
Mon, 11 Apr 2011 11:46:53 +0000 (13:46 +0200)
committerThibault Francois <tfr@openerp.com>
Mon, 11 Apr 2011 11:46:53 +0000 (13:46 +0200)
bzr revid: tfr@openerp.com-20110411114653-b6w336jsx0u4hne4


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