projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0043a58 e6e5ac0)
[MERGE] sitemap backport, merge trunk from 9438 til 9440
authorFabien Meghazi <fme@openerp.com>
Wed, 14 May 2014 10:44:38 +0000 (12:44 +0200)
committerFabien Meghazi <fme@openerp.com>
Wed, 14 May 2014 10:44:38 +0000 (12:44 +0200)
merge from 9438 revid:fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4 til 9440 revid:fp@tinyerp.com-20140511143314-nzn1239l00arbxjq


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