Merge commit 'origin/master' into mdv-gpl3
authorP. Christeas <p_christ@hol.gr>
Wed, 10 Dec 2008 07:59:01 +0000 (09:59 +0200)
committerP. Christeas <p_christ@hol.gr>
Wed, 10 Dec 2008 07:59:01 +0000 (09:59 +0200)
commit281c7c980a3bc955bc470ea829e6012b48b6a9ee
treef15f4d6394b33a63baa651fe4c6f916d02ada687
parent17631aef94b04c393664315d3d17cbe0051c3063
parenta357aa85e58859855761eae990f62e8600204010
Merge commit 'origin/master' into mdv-gpl3

bzr revid: p_christ@hol.gr-20081207195509-2tb8fb3d7qr2xigt
bzr revid: p_christ@hol.gr-20081210075901-97mt6chs3ljokpsx
bin/addons/base/ir/ir.xml
bin/import_xml.rng
bin/netsvc.py
bin/osv/orm.py
bin/tools/convert.py
bin/tools/translate.py