Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorjpope777 <jpope@jpope.org>
Mon, 1 Dec 2014 16:56:55 +0000 (10:56 -0600)
committerjpope777 <jpope@jpope.org>
Mon, 1 Dec 2014 16:56:55 +0000 (10:56 -0600)

Trivial merge