Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 16 Sep 2010 21:13:30 +0000 (23:13 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 16 Sep 2010 21:13:30 +0000 (23:13 +0200)
commite183a2da0fc2d30da30e2745482886f090162263
tree47434ff69d8ca73f45fb19fcf6a93c35f4d6e2c5
parentc53b61e0401422d06fce416f52f10808c5fb7600
parentde30eda12a396c5aa82841e1edd207eaba9cd5b3
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel