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)
commit70100b69290aa561e1b80cfff185d0dad9a86762
tree93a92b081bf2e4607eb35e4e85e61163a0928d18
parent01291d9dd62bc076e39ac39cbe15ea2e0ff33156
parent141f4a826890b395047d27fb670f70a0caaef75a
Merge branch 'master' of ssh://dev.horde.org/horde/git/horde