diff options
| author | P. Christeas <p_christ@hol.gr> | 2009-10-26 12:56:50 +0200 |
|---|---|---|
| committer | P. Christeas <p_christ@hol.gr> | 2009-10-26 12:56:50 +0200 |
| commit | 5ee5a1caef3c2e28622e53ecddf2c13c0efcf4c4 (patch) | |
| tree | 8a520aaf907ebd233fee957d0529c5c41333a832 /bin/tiny_socket.py | |
| parent | c716ecb7319af022447d9685b61e92ab45cc0b80 (diff) | |
| parent | da2e99051a57989c592418668ab4614baf142c4e (diff) | |
Merge remote branch 'origin/master' into optimize
Conflicts:
bin/osv/expression.py
bin/osv/orm.py
bzr revid: p_christ@hol.gr-20091026105650-49wvuk3o7qw1ybkn
Diffstat (limited to 'bin/tiny_socket.py')
0 files changed, 0 insertions, 0 deletions