Merge branch 'master' of ssh://dev.horde.org/horde/git/horde
authorGunnar Wrobel <p@rdus.de>
Thu, 23 Sep 2010 18:11:43 +0000 (20:11 +0200)
committerGunnar Wrobel <p@rdus.de>
Thu, 23 Sep 2010 18:11:43 +0000 (20:11 +0200)

Trivial merge