Merge remote branch 'horde/master' into horde-upstream
authorJan <jan@horde.org>
Thu, 4 Nov 2010 16:05:20 +0000 (16:05 +0000)
committerJan <jan@horde.org>
Thu, 4 Nov 2010 16:05:20 +0000 (16:05 +0000)
commita6732aab8e73e5322089a3f2e03a71fd747a17c4
tree6cfd36cfc08660b1968c8d6f6ae062321890a722
parente2d9811441aa8deef5ac04a4e746e3a654763a59
parent88d459bf2ae29604b5f23e79df16bcfd20f073a3
Merge remote branch 'horde/master' into horde-upstream