Merge branch 'master' into jwandborg-f482_media_attachments
authorChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 23 Aug 2011 02:48:45 +0000 (21:48 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 23 Aug 2011 02:48:45 +0000 (21:48 -0500)
commit894fa564e718af7398f6f368eb3ac0dcb4d45e1f
tree9508a08f8d6598d1040cea44287c0e42af1a1ad6
parent3a8c3a38559f2f81d6155c2349fcddc5ecd6ef28
parent132aa9d97a32abfe86bc5de3ea4e2fa62ddc3793
Merge branch 'master' into jwandborg-f482_media_attachments

Conflicts:
mediagoblin/config_spec.ini
mediagoblin/edit/forms.py
mediagoblin/edit/views.py
mediagoblin/submit/views.py
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/config_spec.ini
mediagoblin/edit/forms.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