Merge remote-tracking branch 'remotes/nyergler/pep8-ification'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 14 Nov 2011 02:23:26 +0000 (20:23 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 14 Nov 2011 02:23:26 +0000 (20:23 -0600)
commitee91c2b88d1a42b9d15d34d2c081cd8394649041
tree01a75b958b2814763a0b219145bbe284d1d04931
parent4671fda345394dad9ca4278b1cf7b2cdf7d2b4ee
parent285ffeddf3542201b83072d3be544c85e9c487c2
Merge remote-tracking branch 'remotes/nyergler/pep8-ification'

Conflicts:
mediagoblin/db/migrations.py
mediagoblin/db/models.py
mediagoblin/user_pages/views.py
mediagoblin/util.py
25 files changed:
mediagoblin/app.py
mediagoblin/auth/forms.py
mediagoblin/auth/lib.py
mediagoblin/auth/views.py
mediagoblin/db/models.py
mediagoblin/decorators.py
mediagoblin/edit/views.py
mediagoblin/gmg_commands/__init__.py
mediagoblin/gmg_commands/import_export.py
mediagoblin/gmg_commands/migrate.py
mediagoblin/gmg_commands/users.py
mediagoblin/listings/views.py
mediagoblin/process_media/__init__.py
mediagoblin/process_media/errors.py
mediagoblin/submit/views.py
mediagoblin/tools/common.py
mediagoblin/tools/mail.py
mediagoblin/tools/pagination.py
mediagoblin/tools/response.py
mediagoblin/tools/template.py
mediagoblin/tools/text.py
mediagoblin/tools/url.py
mediagoblin/user_pages/views.py
mediagoblin/views.py
setup.py