Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sat, 20 Aug 2011 11:58:57 +0000 (11:58 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Sat, 20 Aug 2011 11:58:57 +0000 (11:58 +0000)

Trivial merge