projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f0abd6f b0c9f52)
[MERGE] Sync with trunk, because conflicting with ir_ui_menu lastly udpated.
authorThibault Delavallée <tde@openerp.com>
Mon, 10 Dec 2012 13:22:04 +0000 (14:22 +0100)
committerThibault Delavallée <tde@openerp.com>
Mon, 10 Dec 2012 13:22:04 +0000 (14:22 +0100)
bzr revid: tde@openerp.com-20121210132204-39p7chispvogelux


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