Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Fri, 6 Apr 2012 21:20:29 +0000 (23:20 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Fri, 6 Apr 2012 21:20:29 +0000 (23:20 +0200)

Trivial merge