[MERGE] from trunk
authorRaphael Collet <rco@openerp.com>
Mon, 5 Nov 2012 08:37:56 +0000 (09:37 +0100)
committerRaphael Collet <rco@openerp.com>
Mon, 5 Nov 2012 08:37:56 +0000 (09:37 +0100)
commit401dd57f30849c2b7a7b76c98953aaa3954e0b35
treee1f2081b667ab20853d92201a9ac3bc6b5633673
parentdb13e8591a5c622f25ea9adf65e9810a569f8915
parent958edad9656ccfda7578af0c9d52c1abd8a7fee3
[MERGE] from trunk

bzr revid: rco@openerp.com-20121105083756-jdr9fxp32djpifqk
openerp/tests/__init__.py