Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sat, 12 Nov 2011 15:47:42 +0000 (16:47 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Sat, 12 Nov 2011 15:47:42 +0000 (16:47 +0100)
commit9e62c72daac38e870bf53c44e16bb8ebba2b5c33
tree345d919203a359c5e1557f006488d2741323364b
parent6f005a093e38128d8d5777a26fd5697612c8cd0b
parent231621fff42006e7e782d1fc3c41b0c4cdb24a14
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel