Commit 99f40910d7588c38cd0797d1f8cdc30f555a8c82
authorMichel Pollet <buserror@gmail.com>
Fri, 2 Oct 2015 06:31:03 +0000 (07:31 +0100)
committerMichel Pollet <buserror@gmail.com>
Fri, 2 Oct 2015 06:31:03 +0000 (07:31 +0100)

Trivial merge