Raphael Collet 05851d21ba [MERGE] from trunk ... bzr revid: rco@openerp.com-20130411073017-x6e4h8xbvmy3ofdw		2013-04-11 09:30:17 +02:00
..
__init__.py	merge trunk	2013-02-15 13:25:00 +01:00
common.py	[MERGE] merged trunk.	2013-03-28 10:50:06 +01:00
cron.py	[MERGE] forward merge 7.0 until revision 4919.	2013-04-04 15:07:04 +02:00
db.py	[MERGE] forward merge 7.0 until revision 4919.	2013-04-04 15:07:04 +02:00
http_server.py	[REM] Deleted .apidoc lines.	2013-02-12 15:24:10 +01:00
model.py	[MERGE] from trunk	2013-04-11 09:30:17 +02:00
report.py	[MERGE] openerp.pooler is deprecated.	2013-03-27 17:40:45 +01:00
security.py	[REF] no longer use openerp.pooler.	2013-03-27 12:10:14 +01:00
websrv_lib.py	[REM] Deleted .apidoc lines.	2013-02-12 15:24:10 +01:00
workers.py	[MERGE] forward merge 7.0 until revision 4919.	2013-04-04 15:07:04 +02:00
wsgi_server.py	[MERGE] forward merge 7.0 until revision 4919.	2013-04-04 15:07:04 +02:00