Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Wed, 4 Jan 2012 08:00:42 +0000 (09:00 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Wed, 4 Jan 2012 08:00:42 +0000 (09:00 +0100)

Trivial merge