Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Mon, 30 Jan 2012 23:53:13 +0000 (00:53 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Mon, 30 Jan 2012 23:53:13 +0000 (00:53 +0100)

Trivial merge