Merge branch 'master' of /horde/git/horde
authorJan Schneider <jan@horde.org>
Thu, 4 Nov 2010 10:12:01 +0000 (10:12 +0000)
committerJan Schneider <jan@horde.org>
Thu, 4 Nov 2010 10:12:01 +0000 (10:12 +0000)

Trivial merge