Merge remote-tracking branch 'tilly-q/OPW-Moderation-Update' into merge-tillyq-moderation
authorChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 9 Oct 2013 15:30:19 +0000 (10:30 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 9 Oct 2013 15:30:19 +0000 (10:30 -0500)
1  2 
mediagoblin/db/migrations.py

Simple merge