Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 24 Jul 2011 19:56:39 +0000 (14:56 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 24 Jul 2011 19:56:39 +0000 (14:56 -0500)

Trivial merge