Merge remote branch 'horde/master' into horde-upstream
authorJan <jan@horde.org>
Thu, 4 Nov 2010 14:30:36 +0000 (14:30 +0000)
committerJan <jan@horde.org>
Thu, 4 Nov 2010 14:30:36 +0000 (14:30 +0000)
commite2d9811441aa8deef5ac04a4e746e3a654763a59
tree20c78c4a4f2a35bd37eb630137910e9afe898d18
parent32cdf5fb4161e81c836308394e80ce2c37f0af8e
parentb3cf0e20ec3af5b04aa57151b2bac5919baa4cf4
Merge remote branch 'horde/master' into horde-upstream