Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sun, 26 May 2013 13:47:04 +0000 (15:47 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 26 May 2013 13:47:04 +0000 (15:47 +0200)

Trivial merge