Merge branch 'master' of git+ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Fri, 20 Jan 2012 20:23:40 +0000 (21:23 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Fri, 20 Jan 2012 20:23:40 +0000 (21:23 +0100)

Trivial merge