Merge branch 'horde-upstream'
authorJan <jan@horde.org>
Thu, 4 Nov 2010 14:30:48 +0000 (14:30 +0000)
committerJan <jan@horde.org>
Thu, 4 Nov 2010 14:30:48 +0000 (14:30 +0000)
commit5c8af7494d433ba01b39658da5cf0066c208df32
tree60bf287b29946307b2946af86ed61e0597f02baf
parent5f8b29ae0445d8653faaf3d4823434fedfa7ecee
parente2d9811441aa8deef5ac04a4e746e3a654763a59
Merge branch 'horde-upstream'