Merge branch 'master' of ssh://dev.horde.org/horde/git/horde
authorGunnar Wrobel <wrobel@temple.(none)>
Fri, 26 Feb 2010 21:53:30 +0000 (22:53 +0100)
committerGunnar Wrobel <wrobel@temple.(none)>
Fri, 26 Feb 2010 21:53:30 +0000 (22:53 +0100)
commit4cb1c422c24653231e2b0be8b0010348b3cddc0c
treea7c8bcac425fd2dec137bb776811e55ecef95c0b
parent0085cbe2e43fddf8d24c7b5ec5c7050da945fb01
parent2e2b57dc04d118a5e4dc4faf740b78c3de8aead9
Merge branch 'master' of ssh://dev.horde.org/horde/git/horde