Merge branch 'master' of git://dev.horde.org/horde/git/horde into t/Kolab_Server...
authorGunnar Wrobel <p@rdus.de>
Fri, 20 Mar 2009 22:51:55 +0000 (23:51 +0100)
committerGunnar Wrobel <p@rdus.de>
Fri, 20 Mar 2009 22:51:55 +0000 (23:51 +0100)

Trivial merge