Commit a738c10be7af55ceab73a4ad0367194549af7356
authorMichel Pollet <buserror@gmail.com>
Tue, 14 Apr 2015 20:02:57 +0000 (21:02 +0100)
committerMichel Pollet <buserror@gmail.com>
Tue, 14 Apr 2015 20:02:57 +0000 (21:02 +0100)

Trivial merge