Merge remote-tracking branch 'remotes/lorochka85/bug852_use_media_slug_instead_of_id'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 5 Dec 2011 05:14:08 +0000 (23:14 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 5 Dec 2011 05:14:08 +0000 (23:14 -0600)
commit04b0b7a124130fe4db082c419e6f44a5a212ffab
tree257c51b90aa86810efb839c0ad9af3bb3eb758c2
parenta085dda5d29a1353eaf7df3ddfc3a7c500af9186
parent707001950a42c7adfd6657f227a2c2dbbd09afce
Merge remote-tracking branch 'remotes/lorochka85/bug852_use_media_slug_instead_of_id'

Conflicts:
mediagoblin/decorators.py
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
mediagoblin/decorators.py
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
mediagoblin/tests/test_submission.py