Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Mon, 20 Oct 2014 19:15:10 +0000 (21:15 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Mon, 20 Oct 2014 19:15:10 +0000 (21:15 +0200)

Trivial merge