Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Wed, 8 Feb 2012 18:59:00 +0000 (19:59 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Wed, 8 Feb 2012 18:59:00 +0000 (19:59 +0100)

Trivial merge