diff options
| author | P. Christeas <p_christ@hol.gr> | 2009-03-12 09:50:24 +0200 |
|---|---|---|
| committer | P. Christeas <p_christ@hol.gr> | 2009-03-12 09:50:24 +0200 |
| commit | 7cb394f380e2982b4bdd684bc2b6d2ec5061a334 (patch) | |
| tree | 44b20eecfd77a992650fe6f4c758b5b91c6fa4b5 /bin/sql_db.py | |
| parent | 08b8b3657acd78bc36127dd626109256d4792fd8 (diff) | |
| parent | 24fd395d68f307fe4d259dbeb4aaceb56f5f916a (diff) | |
Merge commit 'origin/master' into mdv-gpl3-py26
Conflicts:
bin/addons/__init__.py
bin/addons/base/ir/ir_cron.py
bin/addons/base/rng/view.rng
bzr revid: p_christ@hol.gr-20090304073610-2ss5ju4lyyue79qv
bzr revid: p_christ@hol.gr-20090308214750-0bgr6yj85f8ixpjp
bzr revid: p_christ@hol.gr-20090312075024-1rqeqam5ipfofb9m
Diffstat (limited to 'bin/sql_db.py')
0 files changed, 0 insertions, 0 deletions