Merge branch 'horde-upstream'
authorJan <jan@horde.org>
Thu, 4 Nov 2010 16:05:36 +0000 (16:05 +0000)
committerJan <jan@horde.org>
Thu, 4 Nov 2010 16:05:36 +0000 (16:05 +0000)
commitca0689f007454687573dccc476d6fd14c29167fc
treee7a72430f6e4d1514328adf375ba81ec92628b83
parent5c8af7494d433ba01b39658da5cf0066c208df32
parenta6732aab8e73e5322089a3f2e03a71fd747a17c4
Merge branch 'horde-upstream'