Merge branch 'master' into next

* master:

doc/UPDATES.md

@@ -1,6 +1,4 @@
 # next
-  * Add 'chanset homechan-user [nothing/voice/op]' to auto-voice or auto-op
-    clients who are opped in 'set homechan'.
 
 # master
   * Require C++11 compiler support (G++ 4.7+, clang32+)
@@ -11,6 +9,8 @@
     will properly assign roles out to bots to not cause overlap. Only leaf
     bots know which bots have which roles. (#39)
   * Add cmd_roles (leaf only) to display roles for a channel. (#39)
+  * Add 'chanset homechan-user [nothing/voice/op]' to auto-voice or auto-op
+    clients who are opped in 'set homechan'.
 
 # maint
   * Clear FiSH keys when a client quits.