Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorthe_mgt <themgt@ueberserver.de>
Sat, 16 Jul 2011 13:17:52 +0000 (15:17 +0200)
committerthe_mgt <themgt@ueberserver.de>
Sat, 16 Jul 2011 13:17:52 +0000 (15:17 +0200)

Trivial merge