From: Kai Schaper <303@posteo.de>
Date: Thu, 20 Oct 2016 15:35:05 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=4b0e3eb1fbc462ee873ad5a996cca25e361ec9fa;p=mastodon.git

Merge remote-tracking branch 'upstream/master'
---

4b0e3eb1fbc462ee873ad5a996cca25e361ec9fa