Merge branch 'horde-upstream'
authorJan Schneider <jan@horde.org>
Tue, 9 Nov 2010 17:11:18 +0000 (18:11 +0100)
committerJan Schneider <jan@horde.org>
Tue, 9 Nov 2010 17:11:18 +0000 (18:11 +0100)
commit075aa65cfb84aba07e9986be3039531067c6ff8a
treea02494b96694b4e5bd8123ae30f4b151f7c55871
parent106c2891030b20441df39d536bb7bc9ea1c8beb2
parentccfe171bb1616f668a2942d93ab134192788a082
Merge branch 'horde-upstream'
framework/Core/lib/Horde/Registry.php
kronolith/templates/index/index.inc