[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Mon, 6 Aug 2012 10:26:30 +0000 (12:26 +0200)
committerVo Minh Thu <vmt@openerp.com>
Mon, 6 Aug 2012 10:26:30 +0000 (12:26 +0200)
commit66d054471c7c57876296d74bc1dda4e746af4c63
tree59362d48aeeb3c4f9e53319b400b6812787ff41b
parent2666ab3fe024c162b2a9efacb540b214010fccc1
parent76f885299f5693673ea197d879f9126009a3cdce
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20120806102630-psx2mywo3w5da81i
openerp/addons/base/module/module.py
openerp/tests/__init__.py
openerp/tools/convert.py