Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Tue, 20 Mar 2012 07:42:21 +0000 (08:42 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Tue, 20 Mar 2012 07:42:21 +0000 (08:42 +0100)

Trivial merge