From: nicolas <nclm@users.noreply.github.com>
Date: Tue, 22 Nov 2016 16:26:17 +0000 (+0100)
Subject: Merge pull request #2 from Gargron/master
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f5dd152e1a83cf2fa19e6082343fe57f7a6382b5;p=mastodon.git

Merge pull request #2 from Gargron/master

Merge
---

f5dd152e1a83cf2fa19e6082343fe57f7a6382b5