From: Carl N Baldwin <cnb@plane.(none)>
Date: Tue, 18 Oct 2005 02:46:22 +0000 (-0600)
Subject: Merge branch 'master' of home:dvl/backup
X-Git-Tag: release-0.4~102
X-Git-Url: http://git.pippins.net/embedvideo/.git/%27%20%20%20%20.%20%24GLOBALS%5B%27phpgw%27%5D-%3Elink%28%27inc/jquery/%7Blink_activity%7D?a=commitdiff_plain;h=8d352159cb90b923e34c879242ed7516418ec827;p=backups%2F.git

Merge branch 'master' of home:dvl/backup
---

8d352159cb90b923e34c879242ed7516418ec827