From: Aaron Williamson Date: Sat, 1 Oct 2011 13:32:43 +0000 (-0400) Subject: Merge branch 'mediagoblin-upstream' into bug444_fix_utils_py_redux X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7ce09f6ac457b820e824942c7dabb05881eb8565;p=mediagoblin.git Merge branch 'mediagoblin-upstream' into bug444_fix_utils_py_redux --- 7ce09f6ac457b820e824942c7dabb05881eb8565