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)
commit99d2ac1d83962fb4dc38f01d63d2ad4036226765
tree5c8a3a8c6f7ee5ea3662a6c791855864c5784e1a
parent30188321531e1b0d3c78166498702bbd8c7dc2bc
parent6506b1e22c70b55a73ee4cb391aebaf73db79ef9
Merge remote-tracking branch 'remotes/jwandborg/master'
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/user_pages/views.py