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)
bzr revid: p_christ@hol.gr-20081207195509-2tb8fb3d7qr2xigt
bzr revid: p_christ@hol.gr-20081210075901-97mt6chs3ljokpsx

1  2 
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

Simple merge
Simple merge
diff --cc bin/netsvc.py
Simple merge
diff --cc bin/osv/orm.py
Simple merge
Simple merge
Simple merge