Merge branch 'master' of /horde/git/horde
authorJan Schneider <jan@horde.org>
Wed, 3 Nov 2010 14:08:20 +0000 (14:08 +0000)
committerJan Schneider <jan@horde.org>
Wed, 3 Nov 2010 14:08:20 +0000 (14:08 +0000)

Trivial merge