Merge branch 'master' of git.sv.gnu.org:/srv/git/mediagoblin
authorBoris Bobrov <breton@cynicmansion.ru>
Sat, 11 Nov 2017 13:05:43 +0000 (16:05 +0300)
committerBoris Bobrov <breton@cynicmansion.ru>
Sat, 11 Nov 2017 13:05:43 +0000 (16:05 +0300)

Trivial merge