Merge branch 'merge-python3-port'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 22 Sep 2014 18:58:13 +0000 (13:58 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 22 Sep 2014 18:58:13 +0000 (13:58 -0500)
commita6252cbf211691aa9d81fd535f5af7bcdbbd6620
treeca1131ba7a8ff0437d392c20a70f17ee7470e3dd
parentc47f402d7ee42e88ee1086351010dd598da6c0a5
parent6430ae97eca57f4db4bcef54436df6c2abcd21ad
Merge branch 'merge-python3-port'

Conflicts:
setup.py
mediagoblin/app.py
mediagoblin/federation/views.py
mediagoblin/gmg_commands/users.py
mediagoblin/init/celery/__init__.py
mediagoblin/tools/response.py
setup.py