Merge in charybdis trunk

diff --cc include/channel.h
Simple merge

diff --cc modules/core/m_mode.c
Simple merge

diff --cc modules/m_info.c
Simple merge

diff --cc src/channel.c
index fc509389b296be92d1771cd8d4a7b677b4d32df7,992b1edd26c50442b6bb6fb88c6121a8f3f325ae..7607ad4ec1a66d43cecb2ac3907fc2ea52955f30
--- 1/src/channel.c
--- 2/src/channel.c
+++ b/src/channel.c
@@@ -1130,11 -1121,11 +1130,11 @@@ channel_modes(struct Channel *chptr, st
                *mbuf++ = 'j';
  
                if(pbuf > buf2 || !IsClient(client_p) || IsMember(client_p, chptr))
-                       pbuf += rb_sprintf(pbuf, " %d:%d", mode->join_num,
-                                          mode->join_time);
+                       pbuf += rb_sprintf(pbuf, " %d:%d", chptr->mode.join_num,
+                                          chptr->mode.join_time);
        }
  
 -      if(*chptr->mode.forward && (ConfigChannel.use_forward || !IsClient(client_p)))
 +      if(*chptr->mode.forward)
        {
                *mbuf++ = 'f';
  

diff --cc src/chmode.c
index d0a5915a418e00e228e8c8942712a922cb05d5be,38393b2a9d1d77df89d9712eac987b38da951b23..e763a4282dca41ff51eab95e2ae23cd1dcbf652b
--- 1/src/chmode.c
--- 2/src/chmode.c
+++ b/src/chmode.c
@@@ -538,8 -516,13 +538,8 @@@ chm_simple(struct Client *source_p, str
                return;
  
        /* setting + */
-       if((dir == MODE_ADD) && !(chptr->mode.mode & mode_type) && !(chptr->mode_lock.off_mode & mode_type))
+       if((dir == MODE_ADD) && !(chptr->mode.mode & mode_type))
        {
 -              /* if +f is disabled, ignore an attempt to set +QF locally */
 -              if(!ConfigChannel.use_forward && MyClient(source_p) &&
 -                 (c == 'Q' || c == 'F'))
 -                      return;
 -
                chptr->mode.mode |= mode_type;
  
                mode_changes[mode_count].letter = c;
@@@ -548,10 -531,9 +548,10 @@@
                mode_changes[mode_count].nocaps = 0;
                mode_changes[mode_count].id = NULL;
                mode_changes[mode_count].mems = ALL_MEMBERS;
 +              mode_changes[mode_count].override = override;
                mode_changes[mode_count++].arg = NULL;
        }
-       else if((dir == MODE_DEL) && (chptr->mode.mode & mode_type) && !(chptr->mode_lock.mode & mode_type))
+       else if((dir == MODE_DEL) && (chptr->mode.mode & mode_type))
        {
                chptr->mode.mode &= ~mode_type;
  

diff --cc src/s_serv.c
Simple merge