From: Svante Bengtson <redacted>
Date: Tue, 23 Feb 2016 10:42:25 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/freenode/web-7.0.git
X-Git-Url: https://jfr.im/git/irc/freenode/web-7.0.git/commitdiff_plain/0b02ffbf73364e57790cde5db8505101e25d5bdc

Merge branch 'master' of https://github.com/freenode/web-7.0.git
---

0b02ffbf73364e57790cde5db8505101e25d5bdc