Merge remote-tracking branch 'refs/remotes/spaetz/521_license_preference' into mergetest
authorChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 22 Jan 2013 19:43:02 +0000 (13:43 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 22 Jan 2013 19:43:02 +0000 (13:43 -0600)
commit79f7cfd900c115fd4c1e4fe8e50f6aad6a56160f
tree13ff8e38e996682451271d5616ea88c91eb8590e
parent55a04f01b881830f164e8a1b0a695dead6cddba3
parentdc4dfbde350fdd9eac50448e42f2c8b209dd6ea8
Merge remote-tracking branch 'refs/remotes/spaetz/521_license_preference' into mergetest
mediagoblin/edit/views.py
mediagoblin/submit/views.py
mediagoblin/templates/mediagoblin/edit/edit_account.html