[MERGE] Merged with main server
authorThibault Delavallée <tde@openerp.com>
Wed, 7 Mar 2012 10:27:45 +0000 (11:27 +0100)
committerThibault Delavallée <tde@openerp.com>
Wed, 7 Mar 2012 10:27:45 +0000 (11:27 +0100)
commita3ccbae972c74b2f4217487d7fda5bb05ab552a8
treef355eef0e41dcce592bc8dd414d3ca2d22a6ea8f
parenta0c806b621e4df3e85556ed048f8bd39fd5ebd1b
parent1ae5913ae8fa5074be0e8da30ec318e2bdde1027
[MERGE] Merged with main server

bzr revid: tde@openerp.com-20120307102745-ldiez32qceqrqqf6
doc/index.rst