Merge remote-tracking branch 'refs/remotes/elrond/misc/use_media_id'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 16 Jan 2013 17:06:22 +0000 (11:06 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 16 Jan 2013 17:06:22 +0000 (11:06 -0600)
1  2 
mediagoblin/edit/views.py
mediagoblin/user_pages/routing.py
mediagoblin/user_pages/views.py

Simple merge
Simple merge
Simple merge