Tim Hoffmann - 2013-06-24

Note: the "join lines before wrapping" option has been reworked in rev. 4076. It now trims additional whitespace, keeps indentation levels and correctly wraps comments.