[commits] Horde branch master updated. 9417e9f9e86366588cd6725edad33d1e37840397

[Jan Schneider]

The branch "master" has been updated.
The following is a summary of the commits.

from: 2f0d03565b452bd94b9e9e0d71e728640ee48a98

9417e9f... Fix incomplete merge.

-----------------------------------------------------------------------

commit 9417e9f9e86366588cd6725edad33d1e37840397
Author: Jan Schneider <jan at horde.org>
Date:   Mon Aug 17 16:32:24 2009 +0200

    Fix incomplete merge.

 framework/Cli/lib/Horde/Cli.php |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

http://git.horde.org/diff.php/framework/Cli/lib/Horde/Cli.php?rt=horde-git&r1=61390c1f227fb1c6facdafe4ecf5aaae3ec89d32&r2=9417e9f9e86366588cd6725edad33d1e37840397