Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 19 Jul 2012 10:18:41 +0000 (12:18 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 19 Jul 2012 10:18:41 +0000 (12:18 +0200)

Trivial merge