[MERGE] Merge with trunk upto revision no 1184.
[odoo/odoo.git] / python25-compat /
2011-09-24 Antony Lesuisse[REM] python25-compat
2009-09-10 P. ChristeasBackport the HTTP server code from python 2.6 to 2.5