Merge commit '5ebef79abecc3ffcc4ab0d46e203d13b068107c9'
authorClément Bœsch <u@pkh.me>
Wed, 15 Mar 2017 22:00:50 +0000 (23:00 +0100)
committerClément Bœsch <u@pkh.me>
Wed, 15 Mar 2017 22:00:50 +0000 (23:00 +0100)
commitdd0abace3ec73d253486a0dd19f43dd9263f8a2f
treec891398aedfe5ebc4332917293924d0b44e3cf8e
parent2f6661c940161e97c7d5a2275e398264b171e001
parent5ebef79abecc3ffcc4ab0d46e203d13b068107c9
Merge commit '5ebef79abecc3ffcc4ab0d46e203d13b068107c9'

* commit '5ebef79abecc3ffcc4ab0d46e203d13b068107c9':
  Fix instances of broken indentation found by gcc 6

Noop, see 21d3f0c026089c44a2

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