projects / mediagoblin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af37cf4 3a69a5d)
Merge branch 'master' into buildout
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 17 Apr 2011 17:45:38 +0000 (12:45 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 17 Apr 2011 17:45:38 +0000 (12:45 -0500)

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