From: Eugen <eugen@zeonfederated.com>
Date: Tue, 4 Apr 2017 21:11:34 +0000 (+0200)
Subject: Merge pull request #876 from krainboltgreene/patch-7
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=ed22f65b3cdd84be5face35d82f127fff6a6b077;p=mastodon.git

Merge pull request #876 from krainboltgreene/patch-7

Quick attempt to get pull requests passing
---

ed22f65b3cdd84be5face35d82f127fff6a6b077