[MERGE] Merge branch lp:~numerigraphe/openobject-server/7.0-translation-order-933496...
authorKersten Jeremy <jke@openerp.com>
Thu, 20 Mar 2014 09:01:05 +0000 (10:01 +0100)
committerKersten Jeremy <jke@openerp.com>
Thu, 20 Mar 2014 09:01:05 +0000 (10:01 +0100)
commit720339ed1d76682f5f971feebf7330fbbba58263
tree8e2d4683db050510725d7c1fa46ea611ce22f533
parent800ab84e3b64b97d534d2f02d1eb7f8098ab16de
parent1f3a482f4fc309262802b980e143234a56b9503d
[MERGE] Merge branch lp:~numerigraphe/openobject-server/7.0-translation-order-933496-numerigraphe

bzr revid: jke@openerp.com-20140320090105-fl2jt7hhplwu6dgr
openerp/tools/translate.py