Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Tue, 21 Jan 2014 20:28:21 +0000 (21:28 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Tue, 21 Jan 2014 20:28:21 +0000 (21:28 +0100)

Trivial merge