Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sun, 20 Oct 2013 16:53:48 +0000 (18:53 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 20 Oct 2013 16:53:48 +0000 (18:53 +0200)

Trivial merge