Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sun, 11 Jan 2015 11:44:49 +0000 (12:44 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 11 Jan 2015 11:44:49 +0000 (12:44 +0100)

Trivial merge