Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Mon, 16 Jul 2012 16:21:37 +0000 (18:21 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Mon, 16 Jul 2012 16:21:37 +0000 (18:21 +0200)

Trivial merge