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)
commit20dc005903502cd72c97992d18708f49bec0c281
tree6553192f325a119a4860a79a0dbf00b28f8b3229
parent6ec6d318313535cbdfe265a7d957704da53bd8b9
parent1d889f6cd96268a7877dbddb55f2b47f7dc8d62b
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel