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)
commit4714bc26d898ca366e2a49fcb9a6626124353851
treecff46508b2402534323ec8e8b0e1f85a801f72ac
parent33d387b0915fbbd5df8807968913a19d668308aa
parent7115a22bef9ead59732b473875f5cd38efee3b38
Merge branch 'master' of /horde/git/horde