Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 3 May 2012 20:06:02 +0000 (22:06 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 3 May 2012 20:06:02 +0000 (22:06 +0200)

Trivial merge