Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sat, 7 May 2011 13:23:49 +0000 (13:23 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Sat, 7 May 2011 13:23:49 +0000 (13:23 +0000)
commit3e037b7e34b506b15a89d2e748de6fbf058b7765
tree55490a4bf1cdc478bdb8d9d1ac79c7d688787c6a
parent9013183e6ac952ede839ef6e6ecd27787ef21fa4
parent69d7c37613081132e8476550c9810d7633d23fde
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel