Commit 24cd41d48bdd6fdaa1ce5ef2edeea67a9bc7cd62
authorMichel Pollet <buserror@gmail.com>
Thu, 2 Mar 2017 17:32:16 +0000 (17:32 +0000)
committerMichel Pollet <buserror@gmail.com>
Thu, 2 Mar 2017 17:32:16 +0000 (17:32 +0000)

Trivial merge