Merge branch 'master' of ssh://debienna.at/debienna
authorMarkus Raab <elektra@markus-raab.org>
Thu, 30 May 2013 19:08:41 +0000 (21:08 +0200)
committerMarkus Raab <elektra@markus-raab.org>
Thu, 30 May 2013 19:08:41 +0000 (21:08 +0200)

Trivial merge