Merge remote-tracking branch 'refs/remotes/dthompson/453_disable_comments'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 10 May 2013 21:33:52 +0000 (16:33 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 10 May 2013 21:33:52 +0000 (16:33 -0500)
commit94fadafe0908e497b9562f6e2689d83d07c5147d
treea7d0b33e7e99139fda43f151dae3d9702a957383
parent0dfa20c984c9e60b02ea9d68db179109028cbe2b
parent99338b6a6419e6d8c044b82b2dd398a435e477f0
Merge remote-tracking branch 'refs/remotes/dthompson/453_disable_comments'
mediagoblin/config_spec.ini
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/user_pages/views.py