From: Alan Pippin Date: Sun, 3 Oct 2010 22:47:35 +0000 (-0600) Subject: Merge branch 'master' of git@github.com:apippin/tc X-Git-Tag: release_1_1_0~18 X-Git-Url: http://git.pippins.net/embedvideo/.git/static/%27%20%20%20%20.%20%24GLOBALS%5B%27phpgw%27%5D-%3Elink%28%27inc/jquery/%7Blink_attendance%7D?a=commitdiff_plain;h=10ad4c2678cb664844bfbc5066f0b817c6cb4a2f;p=eq%2F.git Merge branch 'master' of git@github.com:apippin/tc --- 10ad4c2678cb664844bfbc5066f0b817c6cb4a2f