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)

Trivial merge