fixes colspan width calculations, e.g. #407
Merge pull request #620 from prawnpdf/colspan-fixes

Colspan fixes