From: Alan Pippin <apippin@pippins.net>
Date: Fri, 1 Oct 2010 20:13:09 +0000 (-0600)
Subject: Merge branch 'owenleonard/database_changes' of git@github.com:apippin/3rd into owenle... 
X-Git-Tag: release_1_0_0~5
X-Git-Url: http://git.pippins.net/embedvideo/.git/%7Bedit%7D?a=commitdiff_plain;h=7bb723fd27b007ab4f83131542012aee588625aa;p=eq%2F.git

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

7bb723fd27b007ab4f83131542012aee588625aa