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)
commit27aebe05a64862d552646b2b1e6c59fbe39ae1d5
treed62accc6165941be634f66578c3e82e85d9e7d22
parent4f8f0353b191c71dfa876b12621c573f98e10d1d
parent461dd9717cce6c5b4d40bb4e76ca65d9d898d1df
Merge remote-tracking branch 'refs/remotes/elrond/misc/use_media_id'
mediagoblin/edit/views.py
mediagoblin/user_pages/routing.py
mediagoblin/user_pages/views.py