Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sat, 18 Feb 2012 16:25:23 +0000 (17:25 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Sat, 18 Feb 2012 16:25:23 +0000 (17:25 +0100)

Trivial merge