Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Wed, 7 Sep 2011 12:39:03 +0000 (12:39 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Wed, 7 Sep 2011 12:39:03 +0000 (12:39 +0000)
commit23b89ac78ae15780e0c4096e3354e8dc4e4b34d0
treefe695831e86fbec44e055975aadb3f88a095e0a6
parent01a0fdb8d91b441953247f9d31b633888f90c2a1
parent36c434f2f80b50cb6d639de046ad33eae72dd885
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel