From: nicolas <nclm@users.noreply.github.com>
Date: Fri, 25 Nov 2016 07:53:34 +0000 (+0100)
Subject: Merge pull request #3 from Gargron/master
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=9af6c52a41664e5b6dd7c200d696499e00cf1c01;p=mastodon.git

Merge pull request #3 from Gargron/master

Merge
---

9af6c52a41664e5b6dd7c200d696499e00cf1c01