Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Mon, 30 Jun 2014 19:58:44 +0000 (21:58 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Mon, 30 Jun 2014 19:58:44 +0000 (21:58 +0200)

Trivial merge