Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sat, 14 Jan 2012 15:51:47 +0000 (16:51 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Sat, 14 Jan 2012 15:51:47 +0000 (16:51 +0100)

Trivial merge