[MERGE] forward port of branch 7.0 up to revid 5151 launchpad_translations_on_behalf_...
authorChristophe Simonis <chs@openerp.com>
Wed, 27 Nov 2013 10:58:28 +0000 (11:58 +0100)
committerChristophe Simonis <chs@openerp.com>
Wed, 27 Nov 2013 10:58:28 +0000 (11:58 +0100)
commit657222ea112c2cd25153c6fad32a6718e23c4b77
tree84a9b709ea38929388a5db6d51576c39b3eabc1f
parent6347f9f4ea1412ae86b105c7ee9451f3924db7fe
parent1fedbc18f5a36a5ccbfe14f3ee23466f4a506ee2
[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