Merge branch 'master' of git.sv.gnu.org:/srv/git/mediagoblin
authorBoris Bobrov <breton@cynicmansion.ru>
Fri, 11 Mar 2016 21:34:15 +0000 (00:34 +0300)
committerBoris Bobrov <breton@cynicmansion.ru>
Fri, 11 Mar 2016 21:34:15 +0000 (00:34 +0300)

Trivial merge