From: Alan Pippin <apippin@pippins.net>
Date: Wed, 27 Oct 2010 00:36:11 +0000 (-0600)
Subject: Merge branch 'owenleonard/ht_sandbox' of git@github.com:apippin/tc into owenleonard... 
X-Git-Tag: release_1_1_0^2~2^2~1
X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=commitdiff_plain;ds=sidebyside;h=e0b83b187067cb6b9b7ecfbdd65387c3fed0c237;hp=e0b83b187067cb6b9b7ecfbdd65387c3fed0c237;p=eq%2F.git

Merge branch 'owenleonard/ht_sandbox' of git@github.com:apippin/tc into owenleonard/ht_sandbox
---