diff options
| author | P. Christeas <p_christ@hol.gr> | 2009-09-25 23:47:45 +0300 |
|---|---|---|
| committer | P. Christeas <p_christ@hol.gr> | 2009-09-25 23:47:45 +0300 |
| commit | 71d5ee956afeca90d72a46aacf7adf8c8fed86eb (patch) | |
| tree | db40f24b13d68304d4c1dea72764ccd284cc8bad /python25-compat/SocketServer.py | |
| parent | 282cab24a02cae313e9090eee9e3f3eff0812961 (diff) | |
| parent | 244de09ee563f0e72fa6330c71f316415bb690ad (diff) | |
Merge remote branch 'origin/master', v5.0.6 into optimize
Conflicts:
bin/addons/base/ir/ir_cron.py
bin/netsvc.py
bin/osv/orm.py
bzr revid: p_christ@hol.gr-20090925204745-352t3ngsltr4cj8a
Diffstat (limited to 'python25-compat/SocketServer.py')
0 files changed, 0 insertions, 0 deletions