Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sat, 10 May 2014 09:09:09 +0000 (11:09 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Sat, 10 May 2014 09:09:09 +0000 (11:09 +0200)

Trivial merge