Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 24 Nov 2011 21:57:19 +0000 (22:57 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 24 Nov 2011 21:57:19 +0000 (22:57 +0100)

Trivial merge