Merge branch 'master' of git://dev.horde.org/horde/git/horde into t/Kolab_Server...
authorGunnar Wrobel <p@rdus.de>
Mon, 9 Mar 2009 04:39:30 +0000 (05:39 +0100)
committerGunnar Wrobel <p@rdus.de>
Mon, 9 Mar 2009 04:39:30 +0000 (05:39 +0100)

Trivial merge