Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 5 Jan 2012 20:41:37 +0000 (21:41 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 5 Jan 2012 20:41:37 +0000 (21:41 +0100)

Trivial merge