Merge branch 'master' of git+ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Wed, 31 Dec 2014 19:24:52 +0000 (20:24 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Wed, 31 Dec 2014 19:24:52 +0000 (20:24 +0100)

Trivial merge