From: Alan Jack Pippin <ajp@pippin.(none)>
Date: Sat, 12 Nov 2005 21:50:21 +0000 (-0700)
Subject: Merge branch 'master' of ecbaldwin.net:/home/cnb/dvl/backup/
X-Git-Tag: release-0.4~20
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=f6fdaebaa32fa96fe0f63143846d7db56f382084;p=backups%2F.git

Merge branch 'master' of ecbaldwin.net:/home/cnb/dvl/backup/
---

f6fdaebaa32fa96fe0f63143846d7db56f382084