Merge branch 'master' of auder.net:valse
authoremilie <emilie@devijver.org>
Tue, 6 Dec 2016 17:47:51 +0000 (18:47 +0100)
committeremilie <emilie@devijver.org>
Tue, 6 Dec 2016 17:47:51 +0000 (18:47 +0100)

Trivial merge