From: Boris Bobrov <breton@cynicmansion.ru>
Date: Sun, 20 Dec 2015 23:46:24 +0000 (+0300)
Subject: Merge branch 'stable'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=63053f8c6608501832dbc9d9ab34d45a12204a11;p=mediagoblin.git

Merge branch 'stable'
---

63053f8c6608501832dbc9d9ab34d45a12204a11