Merge branch 'master' into master

diff --cc plugin.py
index b640d37c919a8da184d55809141c5c403251799d,96bc0c8e1fcd391639a89cfc6c7a7434389a0dac..88dbc71ebe2e6810efbe8de53952ee0b0527ea55
--- 1/plugin.py
--- 2/plugin.py
+++ b/plugin.py
@@@ -1088,9 -1143,8 +1143,8 @@@ class Sigyn(callbacks.Plugin,plugins.Ch
                                      if not announced:
                                          announced = True
                                          self.logChannel(irc,"INFO: *@%s is collecting bans (%s/%ss) %s" % (range, permit, self.registryValue('ipv4AbuseLife'), ','.join(chs)))
 -                    
 -   
 +                                permit = permit + 1
 +
- 
      def opStaffers (self,irc):
          ops = []
          if self.registryValue('mainChannel') in irc.state.channels and irc.nick in list(irc.state.channels[self.registryValue('mainChannel')].ops):
@@@ -1693,8 -1752,9 +1752,9 @@@
                              isBanned = True
                              reason = '%s %s' % (reason,bypassIgnore)
                              log = 'BAD: [%s] %s (%s) -> %s' % (channel,msg.prefix,reason,mask)
 -                            chan.klines.enqueue('%s %s' % (msg.nick,mask)) 
 +                            chan.klines.enqueue('%s %s' % (msg.nick,mask))
                              self.ban(irc,msg.nick,msg.prefix,mask,self.registryValue('klineDuration'),reason,self.registryValue('klineMessage'),log,killReason)
+                             self.setRegistryValue('lastActionTaken',time.time(),channel=channel)
                              if i.defcon:
                                  i.defcon = time.time()
                          else: