Merge branch 'master' of git://dev.horde.org/horde/git/horde into t/Kolab_Server...
authorGunnar Wrobel <p@rdus.de>
Wed, 11 Mar 2009 13:59:05 +0000 (14:59 +0100)
committerGunnar Wrobel <p@rdus.de>
Wed, 11 Mar 2009 13:59:05 +0000 (14:59 +0100)

Trivial merge