Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Mon, 18 Jul 2011 00:06:58 +0000 (00:06 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Mon, 18 Jul 2011 00:06:58 +0000 (00:06 +0000)
commitb79a4d642cd2f128589fa850fd1e774cf70cd919
tree68b920f944b68683d81a4fa1647e19f0721d6fae
parent65851c79e6f2a091b923aa8406ad490ed13664f8
parent1de6657c992b704b835c46e89dd0f01244299db9
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel