Merge remote branch 'horde/master' into horde-upstream
authorJan <jan@horde.org>
Thu, 4 Nov 2010 21:26:52 +0000 (21:26 +0000)
committerJan <jan@horde.org>
Thu, 4 Nov 2010 21:26:52 +0000 (21:26 +0000)
commit46e5d6759b6939a64672cc019160390d9be49fa8
tree69b6826aa1a39545cf0cc04b857b469039fd7d00
parent8324d71e079388c3eb6fa9bfac5fba5216df23c6
parent40be1cc07408259452998a02b7825bc843848295
Merge remote branch 'horde/master' into horde-upstream