Merge remote-tracking branch 'refs/remotes/tilly-q/ticket-874' into mergetest
authorChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 10 Jun 2014 21:48:45 +0000 (16:48 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 10 Jun 2014 21:48:45 +0000 (16:48 -0500)
commit70bceff85fd678a7b6653b2bf377b075ebd11590
tree57c4a8d44aa3a9388098d2350bc97b1b6e19c1ee
parent1ec440b44614e8144b8244d28749e2f59d3e4126
parent9adef07e8f0d169e57776bcefc03f2ae17c8920e
Merge remote-tracking branch 'refs/remotes/tilly-q/ticket-874' into mergetest

Conflicts:
mediagoblin/db/migrations.py
mediagoblin/db/migrations.py
mediagoblin/db/models.py