From: victorhck <victorhck@Geeko.site>
Date: Sat, 19 Nov 2016 17:42:37 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=065f372bd10fc63f74ba3c00477e61d83cd28da3;p=mastodon.git

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

065f372bd10fc63f74ba3c00477e61d83cd28da3