Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Mon, 27 Feb 2012 21:52:09 +0000 (22:52 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Mon, 27 Feb 2012 21:52:09 +0000 (22:52 +0100)
commitf6e3cd67388eae6f1c6736a56c916f1a22072237
treeeb8d08fa91ed0fd1af83824409cdcdcfe03d9880
parentded2dfcfba9d0b30ff8f31086d03833d9bd75457
parent52a94413dd96f0abc1642535ac3a67427062d1b0
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel