From: Chuck Hagenbuch Date: Tue, 17 Aug 2010 15:51:57 +0000 (-0400) Subject: Merge branch 'master' of chuck@dev.horde.org:/horde/git/horde X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=f575809aa08edf35a84d4ec294a60d2a4079a274;p=horde.git Merge branch 'master' of chuck@dev.horde.org:/horde/git/horde --- f575809aa08edf35a84d4ec294a60d2a4079a274