diff options
| author | P. Christeas <p_christ@hol.gr> | 2009-08-13 15:04:14 +0300 |
|---|---|---|
| committer | P. Christeas <p_christ@hol.gr> | 2009-08-13 15:04:14 +0300 |
| commit | 2c638055dbf101cfd3749ceb3476107ca0653dd4 (patch) | |
| tree | 5c28166417b33ffb6a2b9f968d739a53b9469275 /python25-compat | |
| parent | 7e9d338e7f37ac4ac7b4e01f1ee4ac4430493add (diff) | |
| parent | 06c062e6cfebdc2426dacdb13cea399e29aa3903 (diff) | |
Merge commit 'origin/master' into xrg
Conflicts:
bin/service/security.py
bzr revid: p_christ@hol.gr-20090813120414-hzfsqq90kr7or65n
Diffstat (limited to 'python25-compat')
0 files changed, 0 insertions, 0 deletions