[MERGE] lp:~openerp-dev/openobject-server/trunk-wkhtmltopdf-stw
authorStephane Wirtel <stw@openerp.com>
Thu, 16 Feb 2012 09:33:19 +0000 (10:33 +0100)
committerStephane Wirtel <stw@openerp.com>
Thu, 16 Feb 2012 09:33:19 +0000 (10:33 +0100)
commit0825d5260354fa8f31d3d027513c8fcd57bf85df
tree01db1897f259aa59e127cd7124582abc60b42731
parentfdf7f935946f85ca53e7a159530d4351aa72735e
parent96dee4a5805e16aadcef760ccee8b2851df2988e
[MERGE] lp:~openerp-dev/openobject-server/trunk-wkhtmltopdf-stw

bzr revid: stw@openerp.com-20120216093319-3a5n7bdky4bm6k5e