Merge branch 'master' of ssh://debienna.at/debienna
authorMarkus Raab <elektra@markus-raab.org>
Wed, 18 Dec 2013 19:15:48 +0000 (20:15 +0100)
committerMarkus Raab <elektra@markus-raab.org>
Wed, 18 Dec 2013 19:15:48 +0000 (20:15 +0100)

Trivial merge