[MERGE] Merged with main server
authorThibault Delavallée <tde@openerp.com>
Thu, 8 Mar 2012 08:39:04 +0000 (09:39 +0100)
committerThibault Delavallée <tde@openerp.com>
Thu, 8 Mar 2012 08:39:04 +0000 (09:39 +0100)
commit071dc54a5c8aedd25e95a99a16c12bb30b0ced37
treef355eef0e41dcce592bc8dd414d3ca2d22a6ea8f
parentdc6b84ab97e899d28d13eb278a001c95e2777adc
parent1ae5913ae8fa5074be0e8da30ec318e2bdde1027
[MERGE] Merged with main server

bzr revid: tde@openerp.com-20120308083904-l05slz6td2ibggk4
doc/index.rst