Merge branch 'horde-upstream'
authorJan <jan@horde.org>
Thu, 4 Nov 2010 13:42:10 +0000 (13:42 +0000)
committerJan <jan@horde.org>
Thu, 4 Nov 2010 13:42:10 +0000 (13:42 +0000)
commit5810c5d7f580ac0ee1b85064fb2722a722163093
tree354bee927a7976472f04821020409b68953e71ca
parentaccd1f4dc1bbdd7db2f3b7a297ee11228bfa22dd
parent32cdf5fb4161e81c836308394e80ce2c37f0af8e
Merge branch 'horde-upstream'