# HG changeset patch
# User Evan Schoenberg <evands@pidgin.im>
# Date 1298329038 0
# Node ID ac78f5ea6e03fe1dc8c52762d54ab2fa07a31b45
# Parent  8b4ad35fb774d365f350b25e54de996b8aaa28c6# Parent  145c6692494e82e0dbdca54b7abda15154be294e
merge of '8b4ad35fb774d365f350b25e54de996b8aaa28c6'
     and '145c6692494e82e0dbdca54b7abda15154be294e'

diff -r 8b4ad35fb774 -r ac78f5ea6e03 libpurple/protocols/irc/parse.c
--- a/libpurple/protocols/irc/parse.c	Mon Feb 21 22:57:05 2011 +0000
+++ b/libpurple/protocols/irc/parse.c	Mon Feb 21 22:57:18 2011 +0000
@@ -65,7 +65,7 @@
 	{ "319", "nn:", irc_msg_whois },	/* Whois channels		*/
 	{ "320", "nn:", irc_msg_whois },	/* Whois (fn ident)		*/
 	{ "314", "nnnvv:", irc_msg_whois },	/* Whowas user			*/
-	{ "315", "nt:", irc_msg_who },      /* end of WHO channel   */
+	{ "315", "nt:", irc_msg_who }, /* end of WHO channel */
 	{ "369", "nt:", irc_msg_endwhois },	/* End of WHOWAS		*/
 	{ "321", "*", irc_msg_list },		/* Start of list		*/
 	{ "322", "ncv:", irc_msg_list },	/* List.			*/
@@ -74,7 +74,7 @@
 	{ "331", "nc:",	irc_msg_topic },	/* No channel topic		*/
 	{ "332", "nc:", irc_msg_topic },	/* Channel topic		*/
 	{ "333", "*", irc_msg_ignore },		/* Topic setter stuff		*/
-	{ "352", "nvcvnvvv:", irc_msg_who },/* Channel WHO			*/
+	{ "352", "nvcvnvvv:", irc_msg_who },	/* Channel WHO			*/
 	{ "353", "nvc:", irc_msg_names },	/* Names list			*/
 	{ "366", "nc:", irc_msg_names },	/* End of names			*/
 	{ "367", "ncnnv", irc_msg_ban },	/* Ban list			*/