[MERGE] trunk
authorAntony Lesuisse <al@openerp.com>
Sun, 25 Sep 2011 00:00:38 +0000 (02:00 +0200)
committerAntony Lesuisse <al@openerp.com>
Sun, 25 Sep 2011 00:00:38 +0000 (02:00 +0200)
commitb91d70a42d5a4d0fb88f7e2b0097fff87283c968
treeaacbbd03fc56a005ccb749a7c1ff0cfbb2fae3ca
parent94393cc074c3536260104a5565aeef72e339c5ce
parent459213444dbdf5221d653a6c5f4351c805bec630
[MERGE] trunk

bzr revid: al@openerp.com-20110925000038-qwfvcrmndstygt2d
openerp-server
openerp/service/__init__.py
openerp/wsgi.py