Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 14 Jun 2012 22:06:26 +0000 (00:06 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 14 Jun 2012 22:06:26 +0000 (00:06 +0200)

Trivial merge