[MERGE] forward port of branch 7.0 up to revid 5224... ...of branch 7.0 up to revid 5224 chs@openerp.com-20140206105141-7e8bv8ordqqsswh7 bzr revid: chs@openerp.com-20140129094554-c3abc8x3qz9mpszr bzr revid: chs@openerp.com-20140129140159-9vwkpr078shoonum bzr revid: chs@openerp.com-20140206110220-myn57cryam1y4k9v
[MERGE] forward port of branch saas-2 up to revid 5006... ...branch saas-2 up to revid 5006 chs@openerp.com-20140129140159-9vwkpr078shoonum bzr revid: chs@openerp.com-20140129094847-4rsg0kjio0ed0rjk bzr revid: chs@openerp.com-20140129141002-4p8fttm8ii0ogsse