Merge commit 'origin/master' into xrg
authorP. Christeas <p_christ@hol.gr>
Thu, 13 Aug 2009 01:07:06 +0000 (04:07 +0300)
committerP. Christeas <p_christ@hol.gr>
Thu, 13 Aug 2009 01:07:06 +0000 (04:07 +0300)
commitaba9fd3e77ce3ecaa7b24e945979942fbd0a8536
treedd0583085e1add72d8642c5ffcdb64ccb6fbed4f
parente9b723e3218439e671d65e2a26b97dcf838edf44
parent076c4f13d628d40be9b2a2eb4e646fa57dfaee74
Merge commit 'origin/master' into xrg

bzr revid: p_christ@hol.gr-20090813010638-2uwue8bg4w5uv99o
bzr revid: p_christ@hol.gr-20090813010706-h9s7e7flcw2wwgt9
bin/osv/orm.py
bin/report/report_sxw.py
bin/tools/config.py
bin/tools/convert.py