diff options
| author | P. Christeas <p_christ@hol.gr> | 2009-08-03 10:23:57 +0300 |
|---|---|---|
| committer | P. Christeas <p_christ@hol.gr> | 2009-08-03 10:23:57 +0300 |
| commit | c3e569fb08207174aacafd0725128d8a9ef90876 (patch) | |
| tree | e831e6978b3c607d5748b681b790efe9e0f47db0 /bin/addons/base/base.sql | |
| parent | fdb3ee7772830d8e1bfde4dfba66a6a729bf28dd (diff) | |
| parent | b2ff94078652379ef3e1ef614ad66e7f5738cd93 (diff) | |
Merge commit 'origin/master' into xrg
Conflicts:
bin/netsvc.py
bin/report/report_sxw.py
setup.py
bzr revid: p_christ@hol.gr-20090803072357-zz2cm1sycsagftnn
Diffstat (limited to 'bin/addons/base/base.sql')
0 files changed, 0 insertions, 0 deletions