Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sat, 21 Jan 2012 22:14:43 +0000 (23:14 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Sat, 21 Jan 2012 22:14:43 +0000 (23:14 +0100)
commit1965fe005619a4a759f23253408cfc3ec9a3ebd2
tree9adcf554a3c2c9f9f06bf52169da1f9f18a9ba90
parent51df62c4732353701b6e7ef05ba586be054fa92d
parent475c21c8532b6ba682535c2b2e19a1427040a669
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel