projects / mediagoblin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 699b547 188240e)
Merge remote-tracking branch 'origin/master' into is315
authorcfdv <caldavis@gmail.com>
Sun, 19 Jun 2011 22:20:23 +0000 (17:20 -0500)
committercfdv <caldavis@gmail.com>
Sun, 19 Jun 2011 22:20:23 +0000 (17:20 -0500)

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