From: Chuck Hagenbuch Date: Wed, 18 Nov 2009 18:00:37 +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=978400dcfd089336bceabcdb8b03937fb29c9994;p=horde.git Merge branch 'master' of chuck@dev.horde.org:/horde/git/horde-hatchery --- 978400dcfd089336bceabcdb8b03937fb29c9994