Fix merging Horde changes to Git.
authorJan Schneider <jan@horde.org>
Wed, 30 Dec 2009 14:24:48 +0000 (15:24 +0100)
committerJan Schneider <jan@horde.org>
Wed, 30 Dec 2009 14:24:48 +0000 (15:24 +0100)
commitf0255540010ff99e282cb371a7bb5fd59e05614c
treed5d4f7db3f1b568d08ce05f2f4d21ff92727d201
parent123bb8818add89d4a54750af95a3f9ff0632db6d
Fix merging Horde changes to Git.
framework/devtools/horde-merge.php