Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorthe_mgt <themgt@ueberserver.de>
Mon, 30 May 2011 22:52:09 +0000 (00:52 +0200)
committerthe_mgt <themgt@ueberserver.de>
Mon, 30 May 2011 22:52:09 +0000 (00:52 +0200)

Trivial merge