Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Fri, 22 Feb 2013 11:41:15 +0000 (12:41 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Fri, 22 Feb 2013 11:41:15 +0000 (12:41 +0100)

Trivial merge