# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1260500872 0
# Node ID a16b0cf55f96276432282a57366eb6a04ac1c859
# Parent  5e4fc3ab19dc726261179289cb741eaae5883b62# Parent  ebba905f197103eec4522ff5c84f3f597fc0f03c
merge of 'a74fb0eb2e8074bf51ffad1750e6eeaf2b28c645'
     and 'ccf98af3ddcc098e9248e09d20f3d0801f3ff47d'

diff -r ebba905f1971 -r a16b0cf55f96 libpurple/protocols/jabber/jingle/jingle.c
--- a/libpurple/protocols/jabber/jingle/jingle.c	Thu Dec 10 22:10:01 2009 +0000
+++ b/libpurple/protocols/jabber/jingle/jingle.c	Fri Dec 11 03:07:52 2009 +0000
@@ -29,12 +29,13 @@
 #include "content.h"
 #include "debug.h"
 #include "jingle.h"
-#include <string.h>
 #include "session.h"
 #include "iceudp.h"
 #include "rawudp.h"
 #include "rtp.h"
 
+#include <string.h>
+
 GType
 jingle_get_type(const gchar *type)
 {