Merge branch 'master' of ssh://git.deb.at/debienna
authorMarkus Raab <elektra@markus-raab.org>
Wed, 12 Aug 2015 18:29:43 +0000 (20:29 +0200)
committerMarkus Raab <elektra@markus-raab.org>
Wed, 12 Aug 2015 18:29:43 +0000 (20:29 +0200)

Trivial merge