diff options
| author | P. Christeas <p_christ@hol.gr> | 2008-12-18 18:49:25 +0200 |
|---|---|---|
| committer | P. Christeas <p_christ@hol.gr> | 2008-12-18 18:49:25 +0200 |
| commit | 18b1a8a843c513dda615c9adcc0dbacf1e153049 (patch) | |
| tree | 7c387729a0352a8aaaf54f18adefa8b609eb038e /sql | |
| parent | 66df224068eee395c24e3caff13cd606ac708361 (diff) | |
| parent | f510071f6b14a5534cadc0aced4dae67c60a2c79 (diff) | |
Merge commit 'origin/master' into mdv-gpl3-fwd
Conflicts:
bin/addons/base/ir/ir_actions.py
bin/netsvc.py
bin/report/report_sxw.py
bin/tools/translate.py
bzr revid: p_christ@hol.gr-20081218164925-uarehzvo3ocu0x2w
Diffstat (limited to 'sql')
0 files changed, 0 insertions, 0 deletions