Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Wed, 1 Dec 2010 21:25:57 +0000 (22:25 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Wed, 1 Dec 2010 21:25:57 +0000 (22:25 +0100)
commit8ec77fe22f3cb317b20fe44b40140c86ad6bd698
tree8b0b96e55a3e89e729fa5121aceb82f5bd8e3178
parentbb5c057c97608a57c1aed4e1f74ba8cf92138f65
parent3b295ceffb3f37b7fc0d6c5997d0a4a2440c5487
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel