Merge remote branch 'remotes/schendje/master'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 30 Jun 2011 17:57:31 +0000 (12:57 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 30 Jun 2011 17:57:31 +0000 (12:57 -0500)
commita86e66b5e06c52d60c98e91da557c489e01b5ca7
treef13db4125a5b5229e0f743870fe1469224e59178
parenta98104eb39c4f74dd5f06ac89bc908e1476a85c7
parent741d5a375dedacfc3867b2e9845fa9c22c1b41bf
Merge remote branch 'remotes/schendje/master'

Conflicts:
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/templates/mediagoblin/user_pages/media.html