Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 9 Aug 2011 03:27:51 +0000 (22:27 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 9 Aug 2011 03:27:51 +0000 (22:27 -0500)

Trivial merge