]> jfr.im git - irc/irssi/irssi.git/commitdiff
Merge branch 'master' into 'security'
authorNei <redacted>
Mon, 2 Jan 2017 17:03:31 +0000 (17:03 +0000)
committerailin-nemui <redacted>
Tue, 3 Jan 2017 12:30:39 +0000 (13:30 +0100)
Sync to master

See merge request !6

1  2 
src/irc/core/irc-queries.c

Simple merge