Merge branch 'stable-78x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-78x
authorWilfried Goesgens <dothebart@citadel.org>
Tue, 24 May 2011 22:03:16 +0000 (22:03 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Tue, 24 May 2011 22:03:16 +0000 (22:03 +0000)

Trivial merge