Merge remote branch 'horde/master' into horde-upstream
authorJan <jan@horde.org>
Fri, 5 Nov 2010 15:12:42 +0000 (15:12 +0000)
committerJan <jan@horde.org>
Fri, 5 Nov 2010 15:12:42 +0000 (15:12 +0000)

Trivial merge