]> jfr.im git - irc/freenode/web-7.0.git/commitdiff
Merge branch 'master' of https://github.com/freenode/web-7.0.git
authorSvante Bengtson <redacted>
Tue, 23 Feb 2016 11:33:39 +0000 (12:33 +0100)
committerSvante Bengtson <redacted>
Tue, 23 Feb 2016 11:33:39 +0000 (12:33 +0100)

Trivial merge