Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Mon, 11 Jun 2012 20:25:00 +0000 (22:25 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Mon, 11 Jun 2012 20:25:00 +0000 (22:25 +0200)

Trivial merge