Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Wed, 18 Jul 2012 15:31:52 +0000 (17:31 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Wed, 18 Jul 2012 15:31:52 +0000 (17:31 +0200)

Trivial merge