Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 14 Jun 2011 02:02:16 +0000 (21:02 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 14 Jun 2011 02:02:16 +0000 (21:02 -0500)

Trivial merge