Merge branch 'master' of auder.net:talweg
authorBenjamin Auder <benjamin.auder@somewhere>
Tue, 25 Apr 2017 21:15:45 +0000 (23:15 +0200)
committerBenjamin Auder <benjamin.auder@somewhere>
Tue, 25 Apr 2017 21:15:45 +0000 (23:15 +0200)

Trivial merge