Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Tue, 3 Jul 2012 20:24:01 +0000 (22:24 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Tue, 3 Jul 2012 20:24:01 +0000 (22:24 +0200)

Trivial merge