Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Tue, 5 Jun 2012 18:54:35 +0000 (20:54 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Tue, 5 Jun 2012 18:54:35 +0000 (20:54 +0200)

Trivial merge