From: Alan Jack Pippin <ajp@pippin.(none)>
Date: Sat, 12 Nov 2005 21:49:28 +0000 (-0700)
Subject: Merging stuff from ecbaldwin.net
X-Git-Tag: release-0.4~21
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=7654514b7d51694491117f94bce432a27b80c2da;p=backups%2F.git

Merging stuff from ecbaldwin.net
---

7654514b7d51694491117f94bce432a27b80c2da