Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 8 Mar 2012 22:37:00 +0000 (23:37 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 8 Mar 2012 22:37:00 +0000 (23:37 +0100)

Trivial merge