merge

diff --cc control/control.c
index a632418068ea740fafdeda21b42523946a3268a5,0f449a6fab53c542f8e98e3df0feb5a0d2db5822..741fa079b1ed4e2474da3ceed675cc67d23b62ff
--- 1/control/control.c
--- 2/control/control.c
+++ b/control/control.c
@@@ -388,7 -388,7 +388,6 @@@ int controlchannel(void *sender, int ca
          buf[i*18]=' ';
      }
    }
--  
  
    for (cbp=cp->bans;cbp;cbp=cbp->next) {
      controlreply((nick *)sender,"Ban     : %s",bantostringdebug(cbp));

diff --cc lib/patricia.c
Simple merge