Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Mon, 2 Jul 2012 23:00:53 +0000 (01:00 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Mon, 2 Jul 2012 23:00:53 +0000 (01:00 +0200)

Trivial merge