Merge branch 'localhub-blame-for-adding-bots'

* localhub-blame-for-adding-bots:
  Give localhubs credit for adding their child bots in 'whois'

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -8,6 +8,7 @@
 * Sanitize cmd_set input locally as well as remotely
 * Ensure that some set variables are only 1 word long.
 * More DNS errors are now handled which fixes some misc DNS issues.
+* Give localhubs credit for adding their child bots in 'whois'
 
 1.2.16 - http://wraith.botpack.net/milestone/1.2.16
 * Add 'set altchars' so that alternative characters used for nicks can be changed. (fixes #418)

src/conf.c

@@ -1172,7 +1172,7 @@ void conf_add_userlist_bots()
         userlist = adduser(userlist, bot->nick, "none", "-", USER_OP, 1);
         u = get_user_by_handle(userlist, bot->nick);
 
-        egg_snprintf(tmp, sizeof(tmp), "%li [internal]", (long)now);
+        egg_snprintf(tmp, sizeof(tmp), "%li %s", (long)now, conf.bot->nick);
         set_user(&USERENTRY_ADDED, u, tmp);
 
         bi = (struct bot_addr *) my_calloc(1, sizeof(struct bot_addr));