changes lines to fit 79-character line-length
Merge branch 'line-lengths'