Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Tue, 29 Jan 2013 23:24:21 +0000 (00:24 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Tue, 29 Jan 2013 23:24:21 +0000 (00:24 +0100)

Trivial merge