Thank you, failing git merge.
authorJan Schneider <jan@horde.org>
Wed, 28 Jul 2010 16:44:20 +0000 (18:44 +0200)
committerJan Schneider <jan@horde.org>
Wed, 28 Jul 2010 16:44:20 +0000 (18:44 +0200)
commit81c121f7b46ef9cb08956636ebbef0ded70796f9
tree6a77c989098d67f0f8e6472f1896580eff6f5c2d
parent7b3bbbebc0bdf043604682a9f7ad347a83b9d0db
Thank you, failing git merge.
ansel/lib/Ansel.php
framework/Url/test/Horde/Url/AddTest.php
framework/Url/test/Horde/Url/RemoveTest.php
horde/admin/datatree.php