From: Alan Pippin <apippin@pippins.net>
Date: Sun, 19 Sep 2010 23:37:57 +0000 (-0600)
Subject: Merge branch 'owenleonard/database_changes' of git@github.com:apippin/3rd into owenle... 
X-Git-Tag: release_1_0_0~17
X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=commitdiff_plain;h=2c76842b2a7410be2e1231bf3cbc369303f784b2;p=eq%2F.git

Merge branch 'owenleonard/database_changes' of git@github.com:apippin/3rd into owenleonard/database_changes
---

2c76842b2a7410be2e1231bf3cbc369303f784b2