Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 4 Nov 2011 13:23:48 +0000 (08:23 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 4 Nov 2011 13:23:48 +0000 (08:23 -0500)

Trivial merge