Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sun, 24 Feb 2013 11:44:45 +0000 (12:44 +0100)
committerWilfried Goesgens <dothebart@citadel.org>
Sun, 24 Feb 2013 11:44:45 +0000 (12:44 +0100)
commit610c65c45406aab08582bf60c3631a13f81678b5
treef96bd944014cb8eedebb924c70000ce1d7d2eb91
parenta5e759daa03e43dfdd940e96c13cded7ba8de39c
parent2a612325dc9205b7fa7c9df2cf3e063a79c22056
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel