Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Fri, 22 Apr 2011 22:50:48 +0000 (22:50 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Fri, 22 Apr 2011 22:50:48 +0000 (22:50 +0000)
commit5003203a0820be8749dcd9c58bac2998a186a308
treef42cfae5d3378a54cb9abd66bb01f90088f5b226
parentbf9467f35a0624692ef11ff1a0c867e33b1a8c54
parent441c89b836af71da9dee873928673f6a083d37bc
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel