Merge branch 'master' of git.sv.gnu.org:/srv/git/mediagoblin
authorBoris Bobrov <breton@cynicmansion.ru>
Fri, 9 Jun 2017 20:50:33 +0000 (23:50 +0300)
committerBoris Bobrov <breton@cynicmansion.ru>
Fri, 9 Jun 2017 20:50:33 +0000 (23:50 +0300)

Trivial merge