Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 26 Jun 2011 20:22:01 +0000 (15:22 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 26 Jun 2011 20:22:01 +0000 (15:22 -0500)

Trivial merge