[MERGE] trunk
authorAntony Lesuisse <al@openerp.com>
Mon, 12 Nov 2012 12:29:44 +0000 (13:29 +0100)
committerAntony Lesuisse <al@openerp.com>
Mon, 12 Nov 2012 12:29:44 +0000 (13:29 +0100)
commit6421dba009932689c5e0cbc52ad4f2e5f4d98091
tree2699bd5033422e979be2bf51781724f6bcc21253
parent1e1b85e95b307f6eb61c46ae9149bf96a46f9145
parent6123dc10f126f765c04d8287bc366db3f9acf595
[MERGE] trunk

bzr revid: al@openerp.com-20121112122944-bw83ixuot2sjvkia
doc/conf.py
openerp-server
openerp/service/__init__.py
openerp/service/wsgi_server.py