Merge branch 'master' of ssh://debienna.at/debienna
authorMarkus Raab <elektra@markus-raab.org>
Tue, 3 Dec 2013 14:47:10 +0000 (15:47 +0100)
committerMarkus Raab <elektra@markus-raab.org>
Tue, 3 Dec 2013 14:47:10 +0000 (15:47 +0100)

Trivial merge