merge
commitdb313489098db3e1835333e347dd18b10d795d51
authorFabien Pinckaers <fp@tinyerp.com>
Mon, 6 Jul 2009 19:32:22 +0000 (6 21:32 +0200)
committerFabien Pinckaers <fp@tinyerp.com>
Mon, 6 Jul 2009 19:32:22 +0000 (6 21:32 +0200)
treee4f4cc43e9ada0862a2627a6bbedeb650d84a6ac
parenta86dc3304ddedd4fa038c208da23be6fffdc405f
merge
[openobject-server @ fp@tinyerp.com-20090706193222-45lelv5ws4b7cr42]
bin/addons/base/ir/ir_actions.py
bin/addons/base/ir/ir_model.py
bin/addons/base/ir/ir_translation.py
bin/osv/orm.py
bin/report/preprocess.py
bin/report/render/odt2odt/odt2odt.py
bin/report/render/rml2pdf/trml2pdf.py
bin/report/render/rml2pdf/utils.py
bin/report/report_sxw.py
bin/tools/convert.py