Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 12 Mar 2012 23:38:35 +0000 (18:38 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 12 Mar 2012 23:38:35 +0000 (18:38 -0500)

Trivial merge