Merge branch 'master' into next

* master:

Conflicts:
	doc/UPDATES
	src/mod/channels.mod/userchan.c

doc/UPDATES

@@ -3,14 +3,6 @@ next
   * Properly honor exemptions when kicking matched RBL clients
   * Fix LASTON not being shared
   * Add chanset 'closed-exempt' which will allow exempting non-users (who are opped or voice) from being kicked. (fixes #171)
-  * Add chanset 'capslimit' to handle % of message that can be in caps before kick (#8)
-  * Add chanset 'colorlimit' to handle how many color codes are allowed in a message before kick (#8)
-  * Fix flood kicking not properly tracking multiple clients at once (#43)
-  * Add chanset 'flood-bytes' to count how many bytes:second a user sends before getting kicked for flood. (#42)
-  * Bot will now lockdown channel (+im) if banlist becomes full (#37)
-  * Bot will now lockdown channel (+im) if a drone flood is detected (#37)
-    * Add chansets 'flood-mchan', 'flood-mbytes', 'flood-mctcp' to control reactions to mass floods (#37)
-  * Remove unneeded chanset 'nomassjoin'
 
 1.4.0 - http://wraith.botpack.net/milestone/1.4.0
   * Updated server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
@@ -51,6 +43,14 @@ next
   * Bots now ask for ops quicker if another bot is opped
   * Bots now request/join +ilk channels much quicker
   * Add 'chanset revenge' which will react/kick/ban/remove users who kick/ban/deop bots.
+  * Fix flood kicking not properly tracking multiple clients at once (#43)
+  * Add chanset 'flood-bytes' to count how many bytes:second a user sends before getting kicked for flood. (#42)
+  * Bot will now lockdown channel (+im) if banlist becomes full (#37)
+  * Bot will now lockdown channel (+im) if a drone flood is detected (#37)
+    * Add chansets 'flood-mchan', 'flood-mbytes', 'flood-mctcp' to control reactions to mass floods (#37)
+  * Remove unneeded chanset 'nomassjoin'
+  * Add chanset 'capslimit' to handle % of message that can be in caps before kick (#8)
+  * Add chanset 'colorlimit' to handle how many color codes are allowed in a message before kick (#8)
 
 1.3.4 - http://wraith.botpack.net/milestone/1.3.4
   * Fix various compile warnings with newer GCC