Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 9 Feb 2012 21:51:16 +0000 (22:51 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 9 Feb 2012 21:51:16 +0000 (22:51 +0100)

Trivial merge