Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Wed, 6 Apr 2011 22:47:01 +0000 (00:47 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Wed, 6 Apr 2011 22:47:01 +0000 (00:47 +0200)
commit98077cf98a82f673c2bc0486e32187c30c267eb4
tree2d32b323e84fb79c11e46364205b189a37ddc4d4
parente24830fa0447f60dad02b4dfd805dc1e7a223633
parent8dd270997a1c9628b6a3c41c92797c5cf9a99648
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel