Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sat, 5 Oct 2013 03:40:30 +0000 (05:40 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Sat, 5 Oct 2013 03:40:30 +0000 (05:40 +0200)

Trivial merge