Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sun, 24 Jul 2011 21:11:19 +0000 (21:11 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 24 Jul 2011 21:11:19 +0000 (21:11 +0000)
commit0108602afaf6ddede92851e3cf3bd6335e5fd8e2
tree661d43294bdc4eae42bdc2170524e1dd689bdf7e
parentd42baa48c6a4f1b88cc4c92e5f1e28711197ac49
parentceffa8fd6967b780a9e74d97a2e49d375d64a4a4
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel