From: svbeon <redacted>
Date: Thu, 25 Feb 2016 20:26:01 +0000 (+0100)
Subject: Merge branch 'master' into svbeon-patch-1
X-Git-Url: https://jfr.im/git/irc/freenode/web-7.0.git/commitdiff_plain/refs/pull/52/head?hp=-c

Merge branch 'master' into svbeon-patch-1
---

c2805fe1e8edf44ec898b1be88d0082d99e35dc1