Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sun, 6 Feb 2011 19:24:42 +0000 (20:24 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 6 Feb 2011 19:24:42 +0000 (20:24 +0100)
commit06dd6b014004b7f12f5cd3c10bfa7711903d3c7a
tree6553192f325a119a4860a79a0dbf00b28f8b3229
parentf85b76d98b6922b36aef7eda85c08c09c478fe71
parentf337bf00f070e11bd43f48075c04b9483d6ee640
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel