Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Tue, 7 Sep 2010 21:01:12 +0000 (23:01 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Tue, 7 Sep 2010 21:01:12 +0000 (23:01 +0200)
commitb4100154cdbc3a4142debcade4afad62f6de81d4
tree1b7feaba0fe59b966a4bab9ccc1646a6cc138e05
parent1265ad6805f0c63cca47b35f6cb59cbac9807752
parent267e2b83ceee867d7bd1ebc4c48cff530e5cb35a
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel