Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sat, 14 Jul 2012 14:51:18 +0000 (16:51 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Sat, 14 Jul 2012 14:51:18 +0000 (16:51 +0200)
ry,


Trivial merge