cpw.malu.xmpp.jingle_ft: 91c85822: Some manual merge...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 91c8582275000dc0525fe1123e3a249e60821cd6
Ancestor: 2df302c68e848da0bb0cfd71989654e6906fef14
Author: malu at pidgin.im
Date: 2009-08-11T18:39:51
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/91c8582275000dc0525fe1123e3a249e60821cd6

Modified files:
        libpurple/protocols/jabber/libxmpp.c

ChangeLog: 

Some manual merge...

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/libxmpp.c	1bdbe06aeb9aad7bee22858bbd21dd500cf5c357
+++ libpurple/protocols/jabber/libxmpp.c	cb9964ec918b367779b56be4931adbb632c8021b
@@ -47,10 +47,10 @@
 #include "caps.h"
 #include "data.h"
 #include "ibb.h"
+#include "xfer.h"
+#include "jingle/jingle.h"
 
 static PurplePlugin *my_protocol = NULL;
-#include "xfer.h"
-#include "jingle/jingle.h"
 
 static PurplePluginProtocolInfo prpl_info =
 {