Merge remote branch 'horde/master' into horde-upstream
authorJan <jan@horde.org>
Thu, 4 Nov 2010 14:30:36 +0000 (14:30 +0000)
committerJan <jan@horde.org>
Thu, 4 Nov 2010 14:30:36 +0000 (14:30 +0000)

Trivial merge