merge upstream
authorChristophe Simonis <chs@openerp.com>
Thu, 11 Oct 2012 09:24:19 +0000 (11:24 +0200)
committerChristophe Simonis <chs@openerp.com>
Thu, 11 Oct 2012 09:24:19 +0000 (11:24 +0200)
commit499bacdce3cdc9e3cc22008567e81d9a963ade7a
treeda942b9216380ba81fcf99a9f7ac30eae99c38fc
parent70f2f8bc8ecd4f2109cad9d61085d42db2c1fd96
parent407979d8d33653274320dc0cf9ef9ac4b0815dd5
merge upstream

bzr revid: chs@openerp.com-20121011092419-lvqp0tu7xxn3n85h
doc/conf.py
setup.py