Merge remote-tracking branch 'refs/remotes/rodney757/email'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 25 Aug 2013 18:23:27 +0000 (13:23 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 25 Aug 2013 18:23:27 +0000 (13:23 -0500)
commit6c3d383bbb0af1ca7ac2ec2b229d148e947608dd
tree6e59e531bf5a2932d2282de305f96d4c54b297c7
parente8eec575f3a1d893036ce9b3356d2f56fd15016d
parentc9f9536cdf32ef597216af0ca7ba25adee799dbb
Merge remote-tracking branch 'refs/remotes/rodney757/email'
mediagoblin/edit/forms.py
mediagoblin/edit/views.py