Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 19 Aug 2011 17:31:31 +0000 (12:31 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 19 Aug 2011 17:31:31 +0000 (12:31 -0500)

Trivial merge