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