diff options
| author | P. Christeas <p_christ@hol.gr> | 2008-12-28 12:25:22 +0200 |
|---|---|---|
| committer | P. Christeas <p_christ@hol.gr> | 2008-12-28 12:25:22 +0200 |
| commit | cb42fd7a590a0a4c4cf75e5c439a50d8592554e9 (patch) | |
| tree | 89093b235302d3b823e3aad1e15b8b981c665696 /bin/tiny_socket.py | |
| parent | a89ae314d25cd47b527cb50dbdc18dc44ad79213 (diff) | |
| parent | f0b13583ecd1dcd8a1ddabd9e67540c5e308220f (diff) | |
Merge branch 'master' of /home/panos/tmp/tinyerp/openobject-server/ into mdv-gpl3
Conflicts:
bin/addons/base/ir/ir_actions.py
bin/report/interface.py
bin/tools/config.py
bzr revid: p_christ@hol.gr-20081228102522-po9ix8j0l6f5akxp
Diffstat (limited to 'bin/tiny_socket.py')
0 files changed, 0 insertions, 0 deletions