Commit df88b48a1f6f569c7f9777f18fde710d21bf82f9
authorMichel Pollet <buserror@gmail.com>
Wed, 2 Aug 2017 08:10:27 +0000 (09:10 +0100)
committerMichel Pollet <buserror@gmail.com>
Wed, 2 Aug 2017 08:10:27 +0000 (09:10 +0100)

Trivial merge