Merge remote-tracking branch 'tilly-q/merge-tillyq-moderation' into merge-tillyq...
authorChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 10 Oct 2013 19:06:07 +0000 (14:06 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 10 Oct 2013 19:06:07 +0000 (14:06 -0500)
1  2 
mediagoblin/db/migrations.py

Simple merge