Merge branch 'mediagoblin-upstream' into bug444_fix_utils_py_redux
authorAaron Williamson <aaron@copiesofcopies.org>
Sat, 1 Oct 2011 13:32:43 +0000 (09:32 -0400)
committerAaron Williamson <aaron@copiesofcopies.org>
Sat, 1 Oct 2011 13:32:43 +0000 (09:32 -0400)
commit7ce09f6ac457b820e824942c7dabb05881eb8565
treed1aa7fed6566ba06d06612f687c68f2d5d0b0271
parentae3bc7fabf8e0abb5f3d8b6534ca451890bbe90b
parent573aba86b58c2ab064d0d57ed0bbae6bdf9a2819
Merge branch 'mediagoblin-upstream' into bug444_fix_utils_py_redux