Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorthe_mgt <themgt@ueberserver.de>
Wed, 27 Jul 2011 10:17:47 +0000 (12:17 +0200)
committerthe_mgt <themgt@ueberserver.de>
Wed, 27 Jul 2011 10:17:47 +0000 (12:17 +0200)
commit3c6900e3c0a37be99a317c4f5710510ba270614a
tree3bce82a32c10250b9b4b25539e21ba853bbae857
parentafcc0978d78e983030f394cb9a6b03021cd206c5
parent4eada64579d0623d9aae4adaf663fdcf8f0a45e1
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel