From: Alan Pippin <apippin@pippins.net>
Date: Thu, 28 Oct 2010 16:59:24 +0000 (-0600)
Subject: Merge branch 'owenleonard/ht_sandbox'
X-Git-Tag: release_1_1_0
X-Git-Url: http://git.pippins.net/embedvideo/.git/static/%7Blink_hometeaching%7D?a=commitdiff_plain;h=5ae6b075235ebca24477826e45076cf5542d18b9;p=eq%2F.git

Merge branch 'owenleonard/ht_sandbox'
---

5ae6b075235ebca24477826e45076cf5542d18b9