Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sat, 21 Jan 2012 22:14:43 +0000 (23:14 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Sat, 21 Jan 2012 22:14:43 +0000 (23:14 +0100)

Trivial merge