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

Merge pull request #6 from Gargron/master

Merge
---

9f9680412f305fb70bbb19f6efd07b484ce82939