adium 3551:cdc30271ae2b: Merged, again.

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/cdc30271ae2b
revision:	3551:cdc30271ae2b
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Wed Nov 17 21:45:04 2010 +0100

Merged, again.

diffs (15 lines):

diff -r 079eb7a72de8 -r cdc30271ae2b Frameworks/libglib.framework/Versions/2.0.0/libglib
Binary file Frameworks/libglib.framework/Versions/2.0.0/libglib has changed
diff -r 079eb7a72de8 -r cdc30271ae2b Frameworks/libpurple.framework/Versions/0.7.5/Headers/auth.h
--- a/Frameworks/libpurple.framework/Versions/0.7.5/Headers/auth.h	Wed Nov 17 21:34:19 2010 +0100
+++ b/Frameworks/libpurple.framework/Versions/0.7.5/Headers/auth.h	Wed Nov 17 21:45:04 2010 +0100
@@ -57,6 +57,7 @@
 #ifdef HAVE_CYRUS_SASL
 JabberSaslMech *jabber_auth_get_cyrus_mech(void);
 #endif
+JabberSaslMech *jabber_auth_get_fb_mech(void);
 
 void jabber_auth_init(void);
 void jabber_auth_uninit(void);
diff -r 079eb7a72de8 -r cdc30271ae2b Frameworks/libpurple.framework/Versions/0.7.5/libpurple
Binary file Frameworks/libpurple.framework/Versions/0.7.5/libpurple has changed