Merge branch 'maint'

* maint:
  Add back bot check in voicing. Lost in f6892d18a

src/mod/irc.mod/chan.cc

@@ -2866,7 +2866,7 @@ static int gotjoin(char *from, char *chname)
           }
 
           /* +v or +voice */
-          if (!chan_hasvoice(m) && dovoice(chan)) {
+          if (!chan_hasvoice(m) && !glob_bot(fr) && dovoice(chan)) {
             if (m->user) {
               if (!(m->flags & EVOICE) &&
                   (