Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 10 May 2013 16:26:55 +0000 (11:26 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 10 May 2013 16:26:55 +0000 (11:26 -0500)

Trivial merge