Merge branch 'master' of git.sv.gnu.org:/srv/git/mediagoblin
authorBoris Bobrov <breton@cynicmansion.ru>
Mon, 26 Jun 2017 18:32:56 +0000 (21:32 +0300)
committerBoris Bobrov <breton@cynicmansion.ru>
Mon, 26 Jun 2017 18:32:56 +0000 (21:32 +0300)

Trivial merge