Merge branch 'master' of /horde/git/horde
authorJan Schneider <jan@horde.org>
Sat, 28 Aug 2010 09:09:09 +0000 (09:09 +0000)
committerJan Schneider <jan@horde.org>
Sat, 28 Aug 2010 09:09:09 +0000 (09:09 +0000)

Trivial merge