From: Chuck Hagenbuch Date: Sat, 15 Nov 2008 17:24:38 +0000 (-0500) Subject: Merge branch 'master' of chuck@dev.horde.org:/horde/git/horde-hatchery X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=46a4ceaace402c1b0605849384f9b2b789760ffe;p=horde.git Merge branch 'master' of chuck@dev.horde.org:/horde/git/horde-hatchery --- 46a4ceaace402c1b0605849384f9b2b789760ffe