Merge remote branch 'remotes/jwandborg/feature_362-simple_comments-acts_on_feedback'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 2 Jul 2011 19:39:35 +0000 (14:39 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 2 Jul 2011 19:39:35 +0000 (14:39 -0500)
commit2110408f4437a9bd7d4d158139cf869518c46456
tree2bcd83b06b993c37f1307acdff9d2f9c9e5c8096
parent29f9df7b27a443b8e7de793c99bc7606ebcf36cb
parent6f59a3a32470b4d83ab94fe7c4dae83943500329
Merge remote branch 'remotes/jwandborg/feature_362-simple_comments-acts_on_feedback'

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