Merge remote branch 'horde/master' into horde-upstream
authorJan <jan@horde.org>
Thu, 4 Nov 2010 13:17:25 +0000 (13:17 +0000)
committerJan <jan@horde.org>
Thu, 4 Nov 2010 13:17:25 +0000 (13:17 +0000)
commit32cdf5fb4161e81c836308394e80ce2c37f0af8e
treed855283a45e864ee485ce225ed3541461e8413fd
parent2e4204647489a26cf80d328c0ede0aaa2acff1be
parent4e5618a47bb981ee86ca29c343a1cac90b8b50de
Merge remote branch 'horde/master' into horde-upstream