diff options
| author | P. Christeas <p_christ@hol.gr> | 2008-12-23 17:46:08 +0200 |
|---|---|---|
| committer | P. Christeas <p_christ@hol.gr> | 2008-12-23 17:46:08 +0200 |
| commit | a8229141bc5af2f20624b4738be1715df5facd40 (patch) | |
| tree | 5e946c168b57fc8f0c22283e32f0dc7e3db89f2c /bin/addons/base/module/wizard/wizard_update_module.py | |
| parent | 0a91836a8e1926f5ec5323bbacb761a7d1a48abe (diff) | |
| parent | f4a6b51fb46c8a948ccc641324ec37dc1a4d6bb2 (diff) | |
Merge branch 'master' of openobject-server into mdv-gpl3-fwd
Conflicts:
bin/netsvc.py
bin/sql_db.py
bin/ssl/SecureXMLRPCServer.py (note: fixes are lost now)
bzr revid: p_christ@hol.gr-20081223154608-fs0830k7vyo81m5u
Diffstat (limited to 'bin/addons/base/module/wizard/wizard_update_module.py')
0 files changed, 0 insertions, 0 deletions