Merge branch 'master' of git+ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sat, 3 Jan 2015 20:34:06 +0000 (21:34 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Sat, 3 Jan 2015 20:34:06 +0000 (21:34 +0100)

Trivial merge