Merge branch 'master' of ssh://debienna.at/debienna
authorMarkus Raab <elektra@markus-raab.org>
Thu, 5 Jun 2014 11:10:40 +0000 (13:10 +0200)
committerMarkus Raab <elektra@markus-raab.org>
Thu, 5 Jun 2014 11:10:40 +0000 (13:10 +0200)

Trivial merge