Merge remote branch 'remotes/cwebber/sqlalchemy'
authorElrond <elrond+mediagoblin.org@samba-tng.org>
Thu, 15 Dec 2011 20:10:01 +0000 (21:10 +0100)
committerElrond <elrond+mediagoblin.org@samba-tng.org>
Thu, 15 Dec 2011 20:10:01 +0000 (21:10 +0100)
* remotes/cwebber/sqlalchemy:
  Beginnings of sqlalchemy models


Trivial merge