Merge branch 'master' of /horde/git/horde
authorJan Schneider <jan@simon.horde.org>
Fri, 13 Aug 2010 09:48:02 +0000 (09:48 +0000)
committerJan Schneider <jan@simon.horde.org>
Fri, 13 Aug 2010 09:48:02 +0000 (09:48 +0000)

Trivial merge