projects / mediagoblin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae3bc7f 573aba8)
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)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.