Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 21 Jun 2011 21:06:09 +0000 (16:06 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 21 Jun 2011 21:06:09 +0000 (16:06 -0500)

Trivial merge