Merge remote branch 'horde/master' into horde-upstream
authorJan <jan@horde.org>
Thu, 4 Nov 2010 21:15:34 +0000 (21:15 +0000)
committerJan <jan@horde.org>
Thu, 4 Nov 2010 21:15:34 +0000 (21:15 +0000)
commit8324d71e079388c3eb6fa9bfac5fba5216df23c6
treeddd43235f5c04a5dafa33f20bfb13f79d950ebde
parenta6732aab8e73e5322089a3f2e03a71fd747a17c4
parent4114202bf64ad75f9f982a288f16a2bd13488041
Merge remote branch 'horde/master' into horde-upstream