Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 20 May 2012 20:24:02 +0000 (15:24 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 20 May 2012 20:24:37 +0000 (15:24 -0500)

Trivial merge