Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Mon, 5 Dec 2011 23:19:36 +0000 (00:19 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Mon, 5 Dec 2011 23:19:36 +0000 (00:19 +0100)
commit35dfcef7abc5e7f6c08a5ca0aab44cbe0031231f
tree6562d37a76158d74ef3b129ded03b699173cf441
parente228e44c6f2f1da0f7167469bca35f48289ba63b
parent307b424c70c4bdf40419da8f5e299c7aed58fcfa
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel