merged from lp:~openerp-report/openobject-server/report-server
merged from lp:~openerp-report/openobject-server/report-server
MarkusTeufelberger/openobject-server,splbio/openobject-server,gisce/openobject-server,vnc-biz/openerp-server,vnc-biz/openerp-server,splbio/openobject-server,ovnicraft/openerp-server,gisce/openobject-server,splbio/openobject-server,gisce/openobject-server,MarkusTeufelberger/openobject-server,MarkusTeufelberger/openobject-server,ovnicraft/openerp-server