Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Fri, 29 Apr 2011 10:14:36 +0000 (10:14 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Fri, 29 Apr 2011 10:14:36 +0000 (10:14 +0000)
commit172a1c664f1d6a68618e8799cdaeee33aa36b9d2
treea2a383b654ad860f30c65054e70e8688946acf5c
parent93cde056c3ee721a2197842b96ea3dafaa167636
parent2cf0b6de44537767f2a7f17798f44fd8ec527c57
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel