Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Tue, 31 Aug 2010 18:00:13 +0000 (20:00 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Tue, 31 Aug 2010 18:00:13 +0000 (20:00 +0200)
commit84f596cfd831e6f38626c2d23c0cb81bee17e1cb
treeddf6e7b0bf432003d7719eee20d184167475426e
parentd91993b02381c683f14bfc6f45476c68ef45662a
parent32db4c337b9af33d964b295cb12b524e396c2e87
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel