Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 1 Dec 2011 22:59:22 +0000 (16:59 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 1 Dec 2011 22:59:22 +0000 (16:59 -0600)

Trivial merge