[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Mon, 6 Feb 2012 20:31:51 +0000 (21:31 +0100)
committerVo Minh Thu <vmt@openerp.com>
Mon, 6 Feb 2012 20:31:51 +0000 (21:31 +0100)
commit23eb63f139266a749f53c05848ce883250b383d0
tree10f3e1c16e0b3411fc84b575582b65f0a2a0e932
parentfcf84b265c8aacae35942be0f2f7dba8e85ebb53
parent5eaf046488549ef29382a7cc8f60565278e9e00c
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20120206203151-3snkz7usngwtv1xt
openerp-server
openerp/modules/module.py
openerp/sql_db.py
openerp/tools/translate.py