Merge remote branch 'remotes/gullydwarf-cfdv/b404_v2_redirect_after_profile_edit'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 7 Jul 2011 03:38:19 +0000 (22:38 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 7 Jul 2011 03:38:19 +0000 (22:38 -0500)
commit1f69672478a4f65fc6b84e3feedb5f3763c420f1
tree0221ccbebf651686e5043e893b26563119ece7f5
parent0f7dc0b4a9ad8b51dada3a034bb9276fa1775380
parent02542d54e1c0556cee79c9f1d75c5dc64aeb18c8
Merge remote branch 'remotes/gullydwarf-cfdv/b404_v2_redirect_after_profile_edit'

Conflicts:
mediagoblin/edit/views.py
mediagoblin/edit/views.py