Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorthe_mgt <themgt@ueberserver.de>
Wed, 6 Jul 2011 22:58:14 +0000 (00:58 +0200)
committerthe_mgt <themgt@ueberserver.de>
Wed, 6 Jul 2011 22:58:14 +0000 (00:58 +0200)

Trivial merge