Christopher Allan Webber 04b0b7a124 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
2011-12-04 23:14:08 -06:00
..
2011-11-20 20:15:21 +01:00
2011-12-04 13:57:35 -06:00
2011-12-04 14:39:42 -06:00
2011-11-02 09:08:45 -05:00
2011-10-01 15:10:02 -07:00
2011-09-05 23:28:41 -05:00
2011-11-22 21:06:08 +01:00
2011-11-21 21:51:30 +01:00