Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sun, 24 Feb 2013 11:44:45 +0000 (12:44 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 24 Feb 2013 11:44:45 +0000 (12:44 +0100)

Trivial merge