Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Fri, 23 Dec 2011 19:04:13 +0000 (20:04 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Fri, 23 Dec 2011 19:04:13 +0000 (20:04 +0100)

Trivial merge