From: Owen Leonard <owen@balawis.leonard.fam>
Date: Wed, 20 Oct 2010 18:41:02 +0000 (-0600)
Subject: Merge commit 'origin/master' into ht_sandbox
X-Git-Tag: release_1_1_0~6
X-Git-Url: http://git.pippins.net/embedvideo/.git/static/images/%7Blink_attendance%7D?a=commitdiff_plain;h=39346e4dae3d877b8aceec8ed6b3dadd2be42d0c;p=eq%2F.git

Merge commit 'origin/master' into ht_sandbox
---

39346e4dae3d877b8aceec8ed6b3dadd2be42d0c