Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 21 Oct 2010 17:05:35 +0000 (19:05 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 21 Oct 2010 17:05:35 +0000 (19:05 +0200)
commit8e096ed7bfde10bc3176933deb7d5c580fbc4a1d
treee5eda611f5e8dbe5a8cfb0be28c3b62d7482ff20
parentf487589549bc482416fe48bff4f5533ba714bbd2
parentc752fbe0f09edf5973191e7d8e411aec654477d8
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel