Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Mon, 27 Feb 2012 21:52:09 +0000 (22:52 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Mon, 27 Feb 2012 21:52:09 +0000 (22:52 +0100)

Trivial merge