Merge branch 'master' of chuck@dev.horde.org:/horde/git/horde
authorChuck Hagenbuch <chuck@horde.org>
Tue, 17 Aug 2010 15:51:57 +0000 (11:51 -0400)
committerChuck Hagenbuch <chuck@horde.org>
Tue, 17 Aug 2010 15:51:57 +0000 (11:51 -0400)
commitf575809aa08edf35a84d4ec294a60d2a4079a274
tree91184be9db02abfdb8c015ca7c79a61858dcf6d2
parent44df8d5b7481367ba7c6835f899d7c41cc5b2d38
parent9aa4da6c3bbac2500b37a093b3ae24c679a6b010
Merge branch 'master' of chuck@dev.horde.org:/horde/git/horde