diff options
| author | P. Christeas <p_christ@hol.gr> | 2009-01-14 09:59:16 +0200 |
|---|---|---|
| committer | P. Christeas <p_christ@hol.gr> | 2009-01-14 09:59:16 +0200 |
| commit | b8d5eac277b3f0374e19b706f62e5294c0320715 (patch) | |
| tree | 1e79e639b7d36710d8271c3b94b73f2fda14c5f4 /sql | |
| parent | 3487f659ec80bda2855885c432af6d71586b3ff5 (diff) | |
| parent | 121bbced1e18c3e54aecddaf2c11bcc49b7153d0 (diff) | |
Merge branch 'master' of /home/panos/tmp/tinyerp/openobject-server/ into mdv-gpl3-py26
Conflicts:
bin/tools/translate.py
bzr revid: p_christ@hol.gr-20090114075916-feh0125soh9euu1h
Diffstat (limited to 'sql')
0 files changed, 0 insertions, 0 deletions