Fix incomplete merge.
authorJan Schneider <jan@horde.org>
Mon, 17 Aug 2009 14:32:24 +0000 (16:32 +0200)
committerJan Schneider <jan@horde.org>
Mon, 17 Aug 2009 14:32:48 +0000 (16:32 +0200)
commit9417e9f9e86366588cd6725edad33d1e37840397
tree2cb1391a8933423250b9703523aea743fd3be0db
parent2f0d03565b452bd94b9e9e0d71e728640ee48a98
Fix incomplete merge.
framework/Cli/lib/Horde/Cli.php