Merge branch 'master' into devel

Bump version to 1.1-dev

RELNOTES.md

@@ -1,5 +1,19 @@
-# PyLink 1.0.0
-Tagged as **1.0.0** by [GLolol](https://github.com/GLolol)
+# PyLink 1.0.1
+Tagged as **1.0.1** by [GLolol](https://github.com/GLolol)
+
+The "Beam" release.
+
+### Changes from 1.0.0
+
+#### Bug fixes
+
+- **Fix PyLink being uninstallable via PyPI due to a missing VERSION file.**
+- ts6: don't crash when CHGHOST target is a nick instead of UID
+- relay: clobber colour codes in hosts
+- bots: allow JOIN/NICK/QUIT on ServiceBot clients
+
+# [PyLink 1.0.0](https://github.com/GLolol/PyLink/releases/tag/1.0.0)
+Tagged as **1.0.0** by [GLolol](https://github.com/GLolol) on 2016-09-17T05:25:51Z
 
 The "Benevolence" release.
 

VERSION

@@ -1 +1 @@
-1.0.0-dev
+1.1-dev

example-conf.yml

@@ -384,7 +384,7 @@ logging:
         #"debug":
         #    loglevel: DEBUG
 
-    filerotation:
+    #filerotation:
         # Configures optional log file rotation. When enabled, PyLink will create rotate files
         # in the format pylink-commands.log, pylink-commands.log.1, pylink-commands.log.2, etc.
         # If either max_bytes or backup_count is 0, log rotation will be disabled.

setup.py

@@ -81,7 +81,7 @@ setup(
 
     # Data files
     package_data={
-        '': ['example-conf.yml', 'example-permissions.yml'],
+        '': ['example-conf.yml', 'example-permissions.yml', 'VERSION', 'README.md'],
     },
 
     package_dir = {'pylinkirc': '.'},