Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Fri, 22 Apr 2011 22:50:48 +0000 (22:50 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Fri, 22 Apr 2011 22:50:48 +0000 (22:50 +0000)
commit93cde056c3ee721a2197842b96ea3dafaa167636
treef42cfae5d3378a54cb9abd66bb01f90088f5b226
parenta0867435cec0b5c7647ff126585664fc05345e08
parentc495f1cded049d60d531ce6de95693b5954d9947
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel