Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 31 Jul 2011 02:51:15 +0000 (21:51 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 31 Jul 2011 02:51:15 +0000 (21:51 -0500)

Trivial merge