Merge branch 'stable-78x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-78x
authorWilfried Goesgens <dothebart@citadel.org>
Sat, 20 Aug 2011 12:11:15 +0000 (12:11 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Sat, 20 Aug 2011 12:11:15 +0000 (12:11 +0000)
commit37b33131205e171b7f687115902f59f9bf7df418
tree3fe1b47925cc8c67d1002a4f09c735d39b5ccc88
parentb03a03a52e83dc1e187133d91ec557fb944acc6e
parentf560f5c7f1c1f4915d0a8ff80b8bfb1714e3979b
Merge branch 'stable-78x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-78x