Merge remote branch 'remotes/jwandborg/issue_363'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 20 Jun 2011 01:00:35 +0000 (20:00 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 20 Jun 2011 01:00:35 +0000 (20:00 -0500)
commit0692c01e4c7b88ce94fe023607109fb978c36c2e
treec906a6068f9d3d5e84b1e66bf063e57bbbd70a47
parent079868489479550d9d8190cde6109cc39cd6272c
parent44e51d3464e719e596e1480b7af2957742a9085b
Merge remote branch 'remotes/jwandborg/issue_363'

Conflicts:
setup.py
mediagoblin/user_pages/views.py
mediagoblin/util.py
setup.py