Merge branch 'mediagoblin-upstream' into bug444_fix_utils_py_redux
authorAaron Williamson <aaron@copiesofcopies.org>
Sat, 1 Oct 2011 22:09:49 +0000 (18:09 -0400)
committerAaron Williamson <aaron@copiesofcopies.org>
Sat, 1 Oct 2011 22:09:49 +0000 (18:09 -0400)
commit91e42c467d898ef70dec2d2d34e4173ea771d2ed
tree0443bd204d4f699a1f519b02fdb568d7a33a1194
parent152a3bfaa36d58e44979f217c5799531f780250f
parentbf33272f03a28c86b91750fed354b75062f516e6
Merge branch 'mediagoblin-upstream' into bug444_fix_utils_py_redux
mediagoblin/auth/views.py