Merge branch 'master' of git@github.com:wrobel/horde into t/Kolab_Server/HK/GW/Initia...
authorGunnar Wrobel <p@rdus.de>
Tue, 3 Mar 2009 18:58:00 +0000 (18:58 +0000)
committerGunnar Wrobel <p@rdus.de>
Tue, 3 Mar 2009 18:58:00 +0000 (18:58 +0000)

Trivial merge