Merge commit '15ee419b7abaf17f8c662c145fe93d3dbf43282b'
authorClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 16:51:56 +0000 (17:51 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 16:51:56 +0000 (17:51 +0100)
* commit '15ee419b7abaf17f8c662c145fe93d3dbf43282b':
  pcx: properly pad the scanline

This commit is a noop, see d24de4596c3f980c9cc1cb5c8706c8411e46275b

Merged-by: Clément Bœsch <u@pkh.me>

Trivial merge