From: Carl Baldwin <cnb@ball.(none)>
Date: Wed, 26 Oct 2005 03:03:50 +0000 (-0600)
Subject: Merge refs/heads/master from origin
X-Git-Tag: release-0.4~58
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=ce454c7d92e63a941a1277406e466005d74eb148;p=backups%2F.git

Merge refs/heads/master from origin
---

ce454c7d92e63a941a1277406e466005d74eb148