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

Trivial merge