Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 3 Aug 2011 23:01:17 +0000 (18:01 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 3 Aug 2011 23:01:17 +0000 (18:01 -0500)

Trivial merge