Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Mon, 28 Nov 2011 23:17:05 +0000 (00:17 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Mon, 28 Nov 2011 23:17:05 +0000 (00:17 +0100)

Trivial merge