Merge branch 'master' of git.sv.gnu.org:/srv/git/mediagoblin
authorBoris Bobrov <breton@cynicmansion.ru>
Fri, 5 Feb 2016 01:32:07 +0000 (04:32 +0300)
committerBoris Bobrov <breton@cynicmansion.ru>
Fri, 5 Feb 2016 01:32:07 +0000 (04:32 +0300)

Trivial merge