Merge remote-tracking branch 'odoo/saas-4' into saas-4-website-mail-group-tde
authorThibault Delavallée <tde@openerp.com>
Fri, 23 May 2014 10:40:39 +0000 (12:40 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 23 May 2014 10:40:39 +0000 (12:40 +0200)
commit41e3f881193d8427dcc99ad8fe88aa14bf7d49ea
tree1e8d2434cd3ac4d651a068555117133ac0361959
parentc40f184102c419213b64107226aa0a622f849753
parent1b0bfd21871d96d99e674b19abc9d7ca10cc7ff9
Merge remote-tracking branch 'odoo/saas-4' into saas-4-website-mail-group-tde