[MERGE] forward port of branch saas-5 up to 651e5ac
authorChristophe Simonis <chs@odoo.com>
Wed, 4 Jun 2014 17:25:40 +0000 (19:25 +0200)
committerChristophe Simonis <chs@odoo.com>
Wed, 4 Jun 2014 17:25:40 +0000 (19:25 +0200)
commit0eb602dd61e0072937f5b3218959da51b9ac4d5d
tree6dc32ee77e5626eae4a0ec30d8019edbf4659384
parentde2f57435eece84c90fab5c3cea3ede867ac0ae7
parent651e5acd5dc3b0e4f88473d881c0d24bb7ef9020
[MERGE] forward port of branch saas-5 up to 651e5ac