Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sun, 29 Apr 2012 10:14:09 +0000 (12:14 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 29 Apr 2012 10:14:09 +0000 (12:14 +0200)

Trivial merge