diff options
| author | P. Christeas <p_christ@hol.gr> | 2009-08-28 21:02:03 +0300 |
|---|---|---|
| committer | P. Christeas <p_christ@hol.gr> | 2009-08-28 21:02:03 +0300 |
| commit | 6e6329bb7d30ed035251e234552808b551933ea2 (patch) | |
| tree | 8a6a48eebf765e69e8635a5121a22e2a098e56eb /python25-compat/SocketServer.py | |
| parent | 2e77de275a114554c25190c7e217f230fedd7173 (diff) | |
| parent | 36b7806e8fb86da2428b11b3f15dca7e33e7a8bb (diff) | |
Merge origin/5.0.4 into xrg
Conflicts:
bin/addons/base/i18n/base.pot
bzr revid: p_christ@hol.gr-20090828180203-xbavbj02nas6f0qy
Diffstat (limited to 'python25-compat/SocketServer.py')
0 files changed, 0 insertions, 0 deletions