Merge branch 'stable-81x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-81x
authorWilfried Goesgens <dothebart@citadel.org>
Thu, 19 Jul 2012 20:07:54 +0000 (22:07 +0200)
committerWilfried Goesgens <dothebart@citadel.org>
Thu, 19 Jul 2012 20:07:54 +0000 (22:07 +0200)
commit7594f9e0850548e6edc6b5d0db91bb9f810b8b8a
treeb7c31cd61a70e13c9def53c6ab57d0750cc2f805
parent494eb9786c001557a6923a1ac035121ce3804daf
parentf2d517832a2ec1a263713ece725b5529781676fa
Merge branch 'stable-81x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-81x