Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorthe_mgt <themgt@ueberserver.de>
Fri, 1 Jul 2011 02:19:01 +0000 (04:19 +0200)
committerthe_mgt <themgt@ueberserver.de>
Fri, 1 Jul 2011 02:19:01 +0000 (04:19 +0200)

Trivial merge