From: Carl N Baldwin <cnb@hpsvcnb.fc.hp.com>
Date: Tue, 1 Nov 2005 22:52:14 +0000 (-0700)
Subject: Merge branch 'master' of home:dvl/backup
X-Git-Tag: release-0.4~28
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=f5737005167a8a146057d72df169420c71401ffd;p=backups%2F.git

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

f5737005167a8a146057d72df169420c71401ffd