From: Svante Bengtson <redacted>
Date: Tue, 23 Feb 2016 00:57:11 +0000 (+0100)
Subject: Merge branch 'mockup' of https://github.com/freenode/web-7.0.git into mockup
X-Git-Url: https://jfr.im/git/irc/freenode/web-7.0.git/commitdiff_plain/5666d852c52cb4e48f9b9e3635577b1cde45e884?hp=-c

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

5666d852c52cb4e48f9b9e3635577b1cde45e884