Merge branch 'master' into next

* master:
  * Fix bind_entry_exec() checking the wrong field for BIND_WANTS_CD

Conflicts:
	doc/UPDATES
	src/debug.c

doc/UPDATES

@@ -8,7 +8,6 @@ next
   * Add [bot]set var 'groups' to configure what groups bots are in
   * Add chanset 'groups' to take a list of groups that should join. 'chanset #chan groups { main backup }'
   * Fix case where nick would rotate to NICK1 when already on NICK2 and NICK was unavailable
-  * Add './wraith -V' which will display the packconfig that the bot is using.
 
 1.4.0 - http://wraith.botpack.net/milestone/1.4.0
   * Updated server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
@@ -26,6 +25,7 @@ next
   * Auto FiSH key-exchange when accepting users via callerid
   * When 'mdop' protection is on, re-op all previously opped clients automatically.
   * When 'mop' protection is on, deop all previously regular clients automatically.
+  * Add './wraith -V' which will display the packconfig that the bot is using.
 
 1.3.3 - http://wraith.botpack.net/milestone/1.3.3
   * Fix --disable-ipv6 compiling

src/binds.c

@@ -281,7 +281,7 @@ static int bind_entry_exec(bind_table_t *table, bind_entry_t *entry, void **al)
 	entry->nhits++;
 
 	/* Does the callback want client data? */
-	if (entry->flags & BIND_WANTS_CD) {
+	if (entry->cflags & BIND_WANTS_CD) {
 		*al = entry->client_data;
 	}
 	else al++;