[MERGE] trunk
authorAntony Lesuisse <al@openerp.com>
Sun, 11 Nov 2012 01:44:31 +0000 (02:44 +0100)
committerAntony Lesuisse <al@openerp.com>
Sun, 11 Nov 2012 01:44:31 +0000 (02:44 +0100)
commitcb66985c9ba042841f8851f16e554500a4461c3e
tree47b8957d72e702cadc1e3b904b6ddf08cbe231c5
parent86321489c8f1aebc1ee6805508397ef332837595
parent91e2d25cdd0054d2c0e9c79973abb6a94d0c2260
[MERGE] trunk

bzr revid: al@openerp.com-20121111014431-bxrn6tte0anyba5v
doc/api/startup.rst
doc/conf.py
doc/index.rst.inc