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)
commit445f0481630d044ae634cafc70fc65172d5aa704
treef4ca5b07506024d22f4421e2df9e1e82f6b8bdec
parent98a35a329803b90e1530f24660b002495d35b81a
parent37044febd8e5108741154fed80830fbf1aaee1c0
Merge branch 'master' of /horde/git/horde