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

Trivial merge