diff options
| author | P. Christeas <p_christ@hol.gr> | 2009-09-25 23:49:10 +0300 |
|---|---|---|
| committer | P. Christeas <p_christ@hol.gr> | 2009-09-25 23:49:10 +0300 |
| commit | afd06e6bf2f2b5be4b0de9b5056ace5c36f134fc (patch) | |
| tree | a74fcdf376891f0ad3170f3195a8dcc948ecac92 /bin/tiny_socket.py | |
| parent | 0e20fddb08e411de92cde6be4f68c029c7aac863 (diff) | |
| parent | 244de09ee563f0e72fa6330c71f316415bb690ad (diff) | |
Merge remote branch 'origin/master' v5.0.6 into xrg
Conflicts:
bin/addons/base/ir/ir_cron.py
bin/netsvc.py
bzr revid: p_christ@hol.gr-20090925204910-uhwimwgfgm94hujn
Diffstat (limited to 'bin/tiny_socket.py')
0 files changed, 0 insertions, 0 deletions