Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Tue, 24 Apr 2012 18:27:06 +0000 (20:27 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Tue, 24 Apr 2012 18:27:06 +0000 (20:27 +0200)

Trivial merge