Merge remote branch 'remotes/jwandborg/f403_ability_to_delete'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 29 Aug 2011 03:05:54 +0000 (22:05 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 29 Aug 2011 03:05:54 +0000 (22:05 -0500)
commit7dc3a66f924c734cbee68677e84f5b656eefe280
treedf091eb3589ec2a7ab711acbe137af3c97a583f0
parentad56a4826b987a0fa8f65849d3611f61cc1f50d6
parent46df0297e029c075a2c28b0c31490c560c99158c
Merge remote branch 'remotes/jwandborg/f403_ability_to_delete'

Conflicts:
mediagoblin/edit/views.py
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/user_pages/routing.py
mediagoblin/edit/views.py
mediagoblin/submit/views.py
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/user_pages/routing.py
mediagoblin/user_pages/views.py