Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 12 May 2011 19:53:43 +0000 (19:53 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 12 May 2011 19:53:43 +0000 (19:53 +0000)
commit80528557c1c6b2d6de94095706d0a0e6b393c3b6
treeb3f0e4b6de062bf5eb938de10255b81a326cee36
parent5c6ff6c468cb4203a30f58e64603abe0551198c6
parent66c74fd66fe5515fc65dd04126dc3ba502b5afb1
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel