# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1234246137 0
# Node ID d720bedc091e10e318dc04df1d0207d500fd6511
# Parent  9ee0cb95a2520cf25f9bc0cb9e9cdc12f91a9a23# Parent  a1b2f2dd48498071b45ca06f93cd10dd0159c7c2
merge of '2026210de0785811e4681fcc9e988fb8d00601ef'
     and 'eaa137ae31ea2eb08bd918eecc45c5de6e2016a3'

diff -r 9ee0cb95a252 -r d720bedc091e libpurple/protocols/jabber/adhoccommands.c
--- a/libpurple/protocols/jabber/adhoccommands.c	Tue Feb 10 04:25:45 2009 +0000
+++ b/libpurple/protocols/jabber/adhoccommands.c	Tue Feb 10 06:08:57 2009 +0000
@@ -229,7 +229,7 @@
 		JabberAdHocCommands *cmd = js->commands->data;
 		g_free(cmd->jid);
 		g_free(cmd->node);
-		g_free(cmd->node);
+		g_free(cmd->name);
 		g_free(cmd);
 		js->commands = g_list_delete_link(js->commands, js->commands);
 	}