diff options
| author | P. Christeas <p_christ@hol.gr> | 2009-10-08 22:50:28 +0300 |
|---|---|---|
| committer | P. Christeas <p_christ@hol.gr> | 2009-10-08 22:50:28 +0300 |
| commit | ffb287777caaa42c2fcaf5b982c117e3c0c8fbe5 (patch) | |
| tree | 3d18a1e9eeb0dd5ae23bb1f5342f59d4f323569e /python25-compat | |
| parent | afd06e6bf2f2b5be4b0de9b5056ace5c36f134fc (diff) | |
| parent | 3c28a101b9c353973a7516c710134405ba55baca (diff) | |
Merge remote branch 'origin/master' into xrg
Conflicts:
bin/addons/base/ir/ir_cron.py
bzr revid: p_christ@hol.gr-20091008195028-eth801qgzj78zrm1
Diffstat (limited to 'python25-compat')
0 files changed, 0 insertions, 0 deletions