[MERGE] forward port of branch saas-5 up to revid c19bb8c
authorChristophe Simonis <chs@odoo.com>
Sun, 1 Jun 2014 12:35:54 +0000 (14:35 +0200)
committerChristophe Simonis <chs@odoo.com>
Sun, 1 Jun 2014 12:35:54 +0000 (14:35 +0200)
commitea69325466d517eae6a6a7e98a725b5959f9ef72
tree9a865d6ccaf374c85265d774414b0e70247b865f
parentbef99e2b16ffec4883d84eaac5b0d2bb9e3fd543
parentc19bb8ce488639eb8dcdf6f506caad96db381223
[MERGE] forward port of branch saas-5 up to revid c19bb8c