[commits] Horde branch master updated. 81c121f7b46ef9cb08956636ebbef0ded70796f9

[Jan Schneider]

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

from: 7b3bbbebc0bdf043604682a9f7ad347a83b9d0db

81c121f Thank you, failing git merge.

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

commit 81c121f7b46ef9cb08956636ebbef0ded70796f9
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jul 28 18:44:20 2010 +0200

    Thank you, failing git merge.

 ansel/lib/Ansel.php                         |    4 ++--
 framework/Url/test/Horde/Url/AddTest.php    |    6 +++---
 framework/Url/test/Horde/Url/RemoveTest.php |    4 ++--
 horde/admin/datatree.php                    |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

http://git.horde.org/diff.php/ansel/lib/Ansel.php?rt=horde-git&r1=108e6725a156313f0d48f64469f36d5859f67919&r2=81c121f7b46ef9cb08956636ebbef0ded70796f9
http://git.horde.org/diff.php/framework/Url/test/Horde/Url/AddTest.php?rt=horde-git&r1=7b3bbbebc0bdf043604682a9f7ad347a83b9d0db&r2=81c121f7b46ef9cb08956636ebbef0ded70796f9
http://git.horde.org/diff.php/framework/Url/test/Horde/Url/RemoveTest.php?rt=horde-git&r1=108e6725a156313f0d48f64469f36d5859f67919&r2=81c121f7b46ef9cb08956636ebbef0ded70796f9
http://git.horde.org/diff.php/horde/admin/datatree.php?rt=horde-git&r1=108e6725a156313f0d48f64469f36d5859f67919&r2=81c121f7b46ef9cb08956636ebbef0ded70796f9