Merge branch 'prototype-1.7' of ssh://git.horde.org/horde/git/horde into prototype-1.7
authorJan Schneider <jan@horde.org>
Wed, 30 Jun 2010 21:35:16 +0000 (23:35 +0200)
committerJan Schneider <jan@horde.org>
Wed, 30 Jun 2010 21:35:16 +0000 (23:35 +0200)
commit3c8646d87999c2b953d452885c5cc99871324652
tree442cc620006adf8a41b83a7908b5c5774282dae2
parentb6c25a57a3d9bfacea760f7464cc4c9c7548f023
parent7a57580deed71706880064e9c53fbe28e91c47ad
Merge branch 'prototype-1.7' of ssh://git.horde.org/horde/git/horde into prototype-1.7