[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)
commit240e91184b710b36b204448d4eaa5cea2cfbbb31
treee29f5a1b0414acef8d5a65d1b1b94f43c856fb21
parent0043a5876339a4e7c0b1c3fe3827f0b27dc9f916
parente6e5ac048b150624750355735b4299421f3c469f
[MERGE] sitemap backport, merge trunk from 9438 til 9440

merge from 9438 revid:fp@tinyerp.com-20140511115231-g8ke14r9iepyypv4 til 9440 revid:fp@tinyerp.com-20140511143314-nzn1239l00arbxjq