[MERGE] from trunk
authorRaphael Collet <rco@openerp.com>
Mon, 29 Oct 2012 15:30:47 +0000 (16:30 +0100)
committerRaphael Collet <rco@openerp.com>
Mon, 29 Oct 2012 15:30:47 +0000 (16:30 +0100)
commit42f0962f99805cba7e93ef201b0d8c7472cb79bd
treedad4e0e006464aabbd4b529a25f0352bb1ba407c
parentcd47a2fcaf70c4f8de970779b2dd98979b2152d7
parentf721ff1d14e267d04e2d8aa24a95e5b190b9e943
[MERGE] from trunk

bzr revid: rco@openerp.com-20121029153047-sd8i97sfkdy1wcb1
doc/conf.py
openerp/osv/fields.py
openerp/tests/__init__.py
setup.py