Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 3 Jun 2012 04:12:45 +0000 (23:12 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 3 Jun 2012 04:12:45 +0000 (23:12 -0500)

Trivial merge