Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 1 Aug 2011 01:53:29 +0000 (20:53 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 1 Aug 2011 01:53:29 +0000 (20:53 -0500)

Trivial merge