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