Merge branch 'stable-78x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-78x
authorWilfried Goesgens <dothebart@citadel.org>
Tue, 24 May 2011 22:03:16 +0000 (22:03 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Tue, 24 May 2011 22:03:16 +0000 (22:03 +0000)
commitf52aed0b1ca67a4a42d67df689177907d46efa86
treef21fc04bf9347219a62644956626db0002189433
parent432f500e59fb0b32f5c85c2cd4ed5758f0127c01
parent7c5f40d5cc0ed9011eb5c6b7ad1b0606f887db29
Merge branch 'stable-78x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-78x