[MERGE] forward port of branch 7.0 up to revid 5151 launchpad_translations_on_behalf_of_openerp-20131127053913-ypnlpggd4wt58pzx
bzr revid: chs@openerp.com-20131127105828-ng8z4by1tszmj9d2
This commit is contained in:
bzr revid: chs@openerp.com-20131127105828-ng8z4by1tszmj9d2