Merge branch 'prototype-1.7' of ssh://git.horde.org/horde/git/horde into prototype-1.7
authorJan Schneider <jan@horde.org>
Wed, 7 Jul 2010 14:13:04 +0000 (16:13 +0200)
committerJan Schneider <jan@horde.org>
Wed, 7 Jul 2010 14:13:04 +0000 (16:13 +0200)
commit29625e5a31cd167cfc5f211e1debeeb9d0b65b90
tree7656c03d143fa29aef087e5bb8de1a011534670f
parent1b5337226a157dd74310fa56f124a4ffa1795997
parent47eba91fe13f787a1ff3bbad6a4435d7c3d386bb
Merge branch 'prototype-1.7' of ssh://git.horde.org/horde/git/horde into prototype-1.7