Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorthe_mgt <themgt@ueberserver.de>
Fri, 8 Jul 2011 07:41:13 +0000 (09:41 +0200)
committerthe_mgt <themgt@ueberserver.de>
Fri, 8 Jul 2011 07:41:13 +0000 (09:41 +0200)
commita3b39562bffdf046924f19399856d95c0e724110
treeef5c78b2ed8b184a086fdd9f0ccf0678615f4cc5
parent40d81e2a425a8f10da783b40da4b157c953ffe31
parent9b2d317d678bc8a0c037063b58e7ab438d665074
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel