Merge branch 'master' of auder.net:talweg
authorBenjamin Auder <benjamin.auder@somewhere>
Wed, 15 Feb 2017 15:23:30 +0000 (16:23 +0100)
committerBenjamin Auder <benjamin.auder@somewhere>
Wed, 15 Feb 2017 15:23:30 +0000 (16:23 +0100)

Trivial merge