]> jfr.im git - irc/freenode/web-7.0.git/commitdiff
Merge branch 'master' into fix-headings 175/head
authorChristel Dahlskjaer <redacted>
Fri, 25 Mar 2016 20:51:41 +0000 (20:51 +0000)
committerChristel Dahlskjaer <redacted>
Fri, 25 Mar 2016 20:51:41 +0000 (20:51 +0000)

Trivial merge