[MERGE] trunk
authorAntony Lesuisse <al@openerp.com>
Sat, 1 Oct 2011 01:22:10 +0000 (03:22 +0200)
committerAntony Lesuisse <al@openerp.com>
Sat, 1 Oct 2011 01:22:10 +0000 (03:22 +0200)
commitace4703440e59d51a28d031b54c7948124197b3e
tree7a3708a414f51ca8e9f4f25f24b54cd385a07872
parentb88209b49923b5080e0e819443e89bdf0f2f6e5d
parent3db71a166b42ba7854235a1a66bac264759ae0e9
[MERGE] trunk

bzr revid: al@openerp.com-20111001012210-uqqso9y80a21hgeo
openerp/osv/osv.py
openerp/wsgi.py