Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sat, 7 May 2011 13:23:49 +0000 (13:23 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Sat, 7 May 2011 13:23:49 +0000 (13:23 +0000)
commit6e18c4206732453ee5f076afca4cb0301f8f0e84
tree55490a4bf1cdc478bdb8d9d1ac79c7d688787c6a
parentf775444e5d1ebc3586ae4c048c54024e3a7a58ac
parent3443b65f1b1012c22a144120098034e17ceb65c1
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel