[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Thu, 1 Dec 2011 15:32:14 +0000 (16:32 +0100)
committerVo Minh Thu <vmt@openerp.com>
Thu, 1 Dec 2011 15:32:14 +0000 (16:32 +0100)
commit842cb1ad41d393a81d9a11a2168117d7836f7ec5
tree540b466622957aea2354426152652539ab4bfe43
parentf1558730f64658e4b55a4f78b023556c1f3f4517
parent43745c4cb9653f40f72a261da655caa4dabe40e7
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20111201153214-0iintvpp7crnr2jc
openerp/addons/base/base.sql
openerp/addons/base/ir/ir_translation.py
openerp/addons/base/module/module.py
openerp/tools/translate.py