Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sat, 3 Aug 2013 14:20:51 +0000 (16:20 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Sat, 3 Aug 2013 14:20:51 +0000 (16:20 +0200)

Trivial merge