Merge remote-tracking branch 'remotes/jwandborg/master'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 24 Nov 2011 21:24:58 +0000 (15:24 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 24 Nov 2011 21:24:58 +0000 (15:24 -0600)
1  2 
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/user_pages/views.py

Simple merge