Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Tue, 21 Feb 2012 22:47:25 +0000 (23:47 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Tue, 21 Feb 2012 22:47:25 +0000 (23:47 +0100)
commit0c9601dbc42e6eb56a75a0e39bada0199616391a
tree4b907d2398be305dcd3d21b3d421a2923e7c5b93
parente1270db35d02e0c12db7417c4912451b0c664132
parentdcf06d1545728cceba8f1395dd3aaa9f1203d9d3
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel