Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jari Matilainen 2014-10-17 00:00:06 +02:00
commit e359fdc2ef

View file

@ -61,7 +61,7 @@
/SERVER CONNECT +chat.freenode.net
/SERVER ADD -network Freenode -noautosendcmd orwell.freenode.net
/SERVER ADD -! -auto -host staff.irssi.org -port 6667 -4 -network Freenode -noproxy orwell.freenode.net
/SERVER REMOVE -network Freenode orwell.freenode.net
/SERVER REMOVE orwell.freenode.net Freenode
/SERVER PURGE
/SERVER PURGE orwell.freenode.net