From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 26 Mar 2017 10:49:31 +0000 (+0200)
Subject: Merge branch 'yiskah-patch-1'
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=874d91126c5c0278d50cfb0d94be23f021239bef;p=mastodon.git

Merge branch 'yiskah-patch-1'
---

874d91126c5c0278d50cfb0d94be23f021239bef