[MERGE] forward port of branch saas-5 up to revid 285e1d5
authorChristophe Simonis <chs@odoo.com>
Sat, 31 May 2014 14:09:03 +0000 (16:09 +0200)
committerChristophe Simonis <chs@odoo.com>
Sat, 31 May 2014 14:09:03 +0000 (16:09 +0200)
commit651614db57521323d937ad6ae4fa8454cb4158a0
tree713d005e0768899b11aa27024f7c4ec96e0dc18c
parentf8714aca0244ac8f8e9969c77ccade5f3f793bb0
parent285e1d5c388b89f119499be28b752111b150aaae
[MERGE] forward port of branch saas-5 up to revid 285e1d5