[MERGE] from server
authorXavier Morel <xmo@openerp.com>
Wed, 7 Nov 2012 11:10:11 +0000 (12:10 +0100)
committerXavier Morel <xmo@openerp.com>
Wed, 7 Nov 2012 11:10:11 +0000 (12:10 +0100)
commit59301c655f13b7ad93bb3b81a38e81a38df16aa1
treec34cc552f33e86c6b431749598ebf94fa5e1a8cf
parent33de722e839aeab1cfb535f57c10b2e8ff6fcceb
parente77725eb892022793e575bbfdbdcde7331e79128
[MERGE] from server

bzr revid: xmo@openerp.com-20121107111011-9q0c8kbuype5a8l6
doc/conf.py
openerp/tests/__init__.py
openerp/tests/common.py