diff options
| author | Thibault Francois <tfr@openerp.com> | 2011-02-24 16:03:09 +0100 |
|---|---|---|
| committer | Thibault Francois <tfr@openerp.com> | 2011-02-24 16:03:09 +0100 |
| commit | 33765897a3ee5a44b3e6f41d5466f3c1849a32ac (patch) | |
| tree | d706ade9a4cfd9dde3872b8cda640f77fa9e914c /python25-compat/SocketServer.py | |
| parent | 6d01d1b175724139ec3653ad5f22e79ab95140db (diff) | |
| parent | 14a1f2b5749e3947f1c08cbec4a316edb67edbaf (diff) | |
[MERGE][FIX] merge from trunk + fixes conflict
bzr revid: tfr@openerp.com-20110224150309-nujh3109r295yc9b
Diffstat (limited to 'python25-compat/SocketServer.py')
0 files changed, 0 insertions, 0 deletions