projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e6bfe65 fa8463f)
[MERGE] trunk
authorAntonin Bourguignon <abo@openerp.com>
Wed, 14 Nov 2012 18:30:21 +0000 (19:30 +0100)
committerAntonin Bourguignon <abo@openerp.com>
Wed, 14 Nov 2012 18:30:21 +0000 (19:30 +0100)
bzr revid: abo@openerp.com-20121114100305-7eb4oinq8ls63gsz
bzr revid: abo@openerp.com-20121114183021-nxx0usyvt7ohfx2r


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