Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Fri, 6 Apr 2012 15:37:36 +0000 (17:37 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Fri, 6 Apr 2012 15:37:36 +0000 (17:37 +0200)

Trivial merge