Merge branch 'ducch-371-take-ignores-cookies' into next

* ducch-371-take-ignores-cookies:
  * Update docs
  * Chanset +take will not set +fastop (only +bitch) (Fixes #371).

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -8,6 +8,7 @@ next
   * Permanent owners can no longer be removed via cmd_mns_user
   * Added SSL support
     This includes new set options: 'servers-ssl', 'servers6-ssl', 'server-port-ssl', 'server-use-ssl'
+  * Fix +take clearing -fastop (fixes #371)
 
 1.3.2 - http://wraith.botpack.net/milestone/1.3.2
   * Add an extra 2 second delay before releasing nick to aide in syncing and time to type /nick

src/mod/channels.mod/tclchan.c

@@ -811,7 +811,7 @@ int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
   }
 
   if ((chan->status ^ old_status) & CHAN_TAKE)
-    chan->status |= (CHAN_FASTOP|CHAN_BITCH);		// to avoid bots still mass opping from +take from not using cookies
+    chan->status |= CHAN_BITCH;		// to avoid bots still mass opping from +take from not using cookies
 
   if (!conf.bot->hub && (chan != chanset_default)) {
     if ((old_status ^ chan->status) & (CHAN_INACTIVE | CHAN_BACKUP)) {