Merge branch 'master' into devel

Conflicts:
	VERSION

RELNOTES.md

@@ -1,10 +1,28 @@
+# PyLink 1.2.0
+The "Dragons" release. Changes since 1.2.0-rc1:
+
+#### Feature changes
+- Make relay nick tagging configurable per-network; backported from 2.0-dev (#494)
+
+#### Bug fixes
+
+- Fix extraneous removal of PID files even when `-n/--no-check-pid` was set or if the PID file already existed on launch (PyLink would quit and delete the old PID file in these cases)
+- servprotect: bump default threshold up to 10 hits/10 seconds, as the old limit was too prone to false positives
+- Fix extraneous queue threads not being stopped when a network disconnects (0d5afd2)
+- Fix relay errors on disconnect due to race conditions in network handling (a0a295f)
+
+#### Misc changes
+- Updated example config and FAQ.
+
+For a summary of major changes since 1.1.x, see the changelog for 1.2.0-rc1.
+
 # PyLink 1.2.0-rc1
 
 The "Droplet" release. Changes since 1.2-beta1:
 
 #### Bug fixes
 - relay: fix channel claim disabling (i.e. "`CLAIM #channel -`" was broken since 1.2-alpha1)
-- IRCS2SProtocol: fix `UnboundLocalError` in "message coming from wrong wrong way" error
+- IRCS2SProtocol: fix `UnboundLocalError` in "message coming from wrong way" error
 - ts6: fix parsing of the `INVITE` command's `ts` argument
 - automode: fix formatting and examples in `setacc` help text
 - p10: fix rejoin-on-kick relaying by also acknowledging kicks sent from PyLink to its clients with a PART