Merge remote branch 'upstream/master'

Conflicts:
	src/chanserv.c

diff --cc src/chanserv.c
index fa1827fa6e59d68c9455901faf960246d406c11f,2ba265f1ab6cc778baceed3c9fae8cb4c50a534c..11b2c74e5677e7a1292e62cb4044dc0f602dd946
--- 1/src/chanserv.c
--- 2/src/chanserv.c
+++ b/src/chanserv.c
@@@ -3884,22 -3661,17 +3884,22 @@@ static CHANSERV_FUNC(cmd_myaccess
      for(uData = target_handle->channels; uData; uData = uData->u_next)
      {
          struct chanData *cData = uData->channel;
 +        ccount++;
+         unsigned int base_len;
  
          if(uData->access > UL_OWNER)
              continue;
 +        if(uData->access == UL_OWNER)
 +            ocount++;
 +
          if(IsProtected(cData)
             && (target_handle != user->handle_info)
 -           && !GetTrueChannelAccess(cData, user->handle_info))
 +           && !GetTrueChannelAccess(cData, user->handle_info)
 +           && !IsNetworkHelper(user))
              continue;
          sbuf.used = 0;
-         string_buffer_append_printf(&sbuf, "[%s (%d", cData->channel->name, uData->access);
-         if(uData->flags != USER_AUTO_OP)
-             string_buffer_append(&sbuf, ',');
+         string_buffer_append_printf(&sbuf, "[%s (%d,", cData->channel->name, uData->access);
+         base_len = sbuf.used;
          if(IsUserSuspended(uData))
              string_buffer_append(&sbuf, 's');
          if(IsUserAutoOp(uData))