Merge branch 'master' of ssh://debienna.at/debienna
authorMarkus Raab <elektra@markus-raab.org>
Sun, 12 Jan 2014 14:38:37 +0000 (15:38 +0100)
committerMarkus Raab <elektra@markus-raab.org>
Sun, 12 Jan 2014 14:38:37 +0000 (15:38 +0100)

Trivial merge