]> jfr.im git - irc/freenode/web-7.0.git/commitdiff
Merge branch 'master' into 404 108/head
authorJohn Dallahan <redacted>
Thu, 3 Mar 2016 08:46:25 +0000 (10:46 +0200)
committerJohn Dallahan <redacted>
Thu, 3 Mar 2016 08:46:25 +0000 (10:46 +0200)

Trivial merge