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)
commita0033abb9b6c7d9b42cb82b91bba27d7fe238038
tree027ec8f5fa800a77b4007c2f8d293e5228de7c3b
parent8d45c4463bf7bf9dfebe919bb12d588d45d7e30c
parentccca0fbfc3667900d0a5ad3687c27f4fd72db061
Merge remote branch 'remotes/cwebber/sqlalchemy'

* remotes/cwebber/sqlalchemy:
  Beginnings of sqlalchemy models