Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 22 Apr 2012 15:06:52 +0000 (10:06 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 22 Apr 2012 15:06:52 +0000 (10:06 -0500)

Trivial merge