Merge branch 'master' into OPW-Moderation-Update
authortilly-Q <nattilypigeonfowl@gmail.com>
Thu, 12 Sep 2013 22:58:04 +0000 (18:58 -0400)
committertilly-Q <nattilypigeonfowl@gmail.com>
Thu, 12 Sep 2013 22:58:04 +0000 (18:58 -0400)
commit045fe0ee9d43aa825de6fbf14fe8fd48953d4eff
treee0743c13e20845a613ba8e4064cb1e0f10f54025
parenta02831687a6026b2baa0f971ecb3e594c3f415e2
parent66cafc3b74d476710013efb46341b989028f3057
Merge branch 'master' into OPW-Moderation-Update

Conflicts:
mediagoblin/db/migrations.py
mediagoblin/auth/views.py
mediagoblin/db/migrations.py
mediagoblin/db/models.py
mediagoblin/edit/views.py
mediagoblin/templates/mediagoblin/base.html
mediagoblin/tests/test_edit.py
mediagoblin/tests/test_notifications.py