[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 7.0 up to revid 4075... ...of branch 7.0 up to revid 4075 chs@openerp.com-20131122170316-lbuxddprrgz1are3 bzr revid: chs@openerp.com-20131122131553-i22dj95bvofb7aeu bzr revid: chs@openerp.com-20131122172422-tsd8wzqkbqknrw1w