Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 29 Dec 2011 12:02:48 +0000 (13:02 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 29 Dec 2011 12:02:48 +0000 (13:02 +0100)

Trivial merge