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)
commit0047bc2e3202cf1f43125a1989c2bae579882d4f
treec7149f43e131203feaa299ed6763414665030401
parent33e0a4124b784930dfb3d7a9876f781129769253
parentc85a6e35ff877a8bb6ab017825a983ab6e12dad4
Merge branch 'master' of /horde/git/horde