Merge remote-tracking branch 'refs/remotes/elrond/sql/migrate_new_tables'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 26 Nov 2012 21:15:13 +0000 (15:15 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 26 Nov 2012 21:15:13 +0000 (15:15 -0600)

Trivial merge