#
# ChangeLog for lib
#
# Generated by Trac 1.2.3
# 2024-11-16T06:52:45Z

Sun, 03 Jun 2012 23:08:43 GMT Wilmer van der Gaast <wilmer@…> [7a2a486]
	* bitlbee.h (modified)
	* lib/xmltree.c (modified)
	* protocols/oscar/oscar.c (modified)

	Shut up a flood of GLib-related compiler warnings.


Tue, 10 Apr 2012 09:14:58 GMT Wilmer van der Gaast <wilmer@…> [632f3d4]
	* lib/ssl_gnutls.c (modified)

	Work-around for what turned out to be a GnuTLS bug (#938). From ...


Sat, 11 Feb 2012 12:55:45 GMT Wilmer van der Gaast <wilmer@…> [7fa5c19]
	* Makefile (modified)
	* configure (modified)
	* doc/Makefile (modified)
	* doc/user-guide/Makefile (modified)
	* lib/Makefile (modified)
	* protocols/Makefile (modified)
	* protocols/jabber/Makefile (modified)
	* protocols/msn/Makefile (modified)
	* protocols/oscar/Makefile (modified)
	* protocols/purple/Makefile (modified)
	* protocols/skype/Makefile (modified)
	* protocols/twitter/Makefile (modified)
	* protocols/yahoo/Makefile (modified)
	* tests/Makefile (modified)

	Rename SRCDIR directory to _SRCDIR_. I guess #907 was caused by ...


Fri, 10 Feb 2012 13:37:08 GMT Wilmer van der Gaast <wilmer@…> [e0a0a42]
	* lib/sha1.c (modified)
	* lib/sha1.h (modified)

	Added sha1_random_uuid function, which I will use later to generate ...


Wed, 04 Jan 2012 00:01:51 GMT Wilmer van der Gaast <wilmer@…> [7615726]
	* lib/oauth2.c (modified)

	Fixing one compiler warning that shouldn't indicate any real problem ...


Tue, 03 Jan 2012 23:53:28 GMT Wilmer van der Gaast <wilmer@…> [59c03bd]
	* lib/ssl_gnutls.c (modified)
	* lib/ssl_openssl.c (modified)

	A few more SSL fixes merged from AopicieR. This also fixes OpenSSL ...


Thu, 29 Dec 2011 20:30:43 GMT Wilmer van der Gaast <wilmer@…> [59cd92b]
	* lib/ssl_gnutls.c (modified)

	Keep only one xcred object globally instead of one per connection. ...


Mon, 26 Dec 2011 10:50:34 GMT Wilmer van der Gaast <wilmer@…> [644b808]
	* lib/oauth2.c (modified)
	* protocols/jabber/sasl.c (modified)
	* root_commands.c (modified)

	A few more minor cleanups before merging this into mainline.


Sat, 24 Dec 2011 18:12:15 GMT Wilmer van der Gaast <wilmer@…> [9a1c14d]
	* lib/arc.c (modified)
	* storage_xml.c (modified)

	An empty password is still a password, don't refuse accounts for
	that.


Sat, 24 Dec 2011 18:02:39 GMT Wilmer van der Gaast <wilmer@…> [164352e]
	* bitlbee.conf (modified)
	* bitlbee.h (modified)
	* conf.c (modified)
	* conf.h (modified)
	* configure (modified)
	* debian/changelog (modified)
	* debian/control (modified)
	* debian/rules (modified)
	* doc/user-guide/commands.xml (modified)
	* irc.h (modified)
	* lib/events_glib.c (modified)
	* lib/http_client.c (modified)
	* lib/ssl_bogus.c (modified)
	* lib/ssl_client.h (modified)
	* lib/ssl_gnutls.c (modified)
	* lib/ssl_nss.c (modified)
	* lib/ssl_openssl.c (modified)
	* protocols/bee.h (modified)
	* protocols/jabber/io.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/msn/soap.c (modified)
	* protocols/skype/skype.c (modified)
	* unix.c (modified)

	Merging mainline.


Sat, 24 Dec 2011 14:52:35 GMT Wilmer van der Gaast <wilmer@…> [5513f3e]
	* configure (modified)
	* lib/ssl_gnutls.c (modified)

	Fix compatibility with old GnuTLS versions, but with a warning. See ...


Fri, 23 Dec 2011 22:40:17 GMT Wilmer van der Gaast <wilmer@…> [200e151]
	* lib/ssl_client.h (modified)
	* lib/ssl_nss.c (modified)
	* lib/ssl_openssl.c (modified)

	tls_verify correction: Don't fail cert verification in non-GnuTLS ...


Fri, 23 Dec 2011 12:44:08 GMT Wilmer van der Gaast <wilmer@…> [792a93b]
	* bitlbee.conf (modified)
	* conf.c (modified)
	* conf.h (modified)
	* doc/user-guide/commands.xml (modified)
	* lib/http_client.c (modified)
	* lib/ssl_bogus.c (modified)
	* lib/ssl_client.h (modified)
	* lib/ssl_gnutls.c (modified)
	* lib/ssl_nss.c (modified)
	* lib/ssl_openssl.c (modified)
	* protocols/jabber/io.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/msn/soap.c (modified)
	* protocols/skype/skype.c (modified)

	Merging SSL certificate verification for GnuTLS, with help from
	AopicieR.


Wed, 21 Dec 2011 19:35:13 GMT Wilmer van der Gaast <wilmer@…> [e306fbf]
	* lib/oauth.c (modified)
	* protocols/twitter/twitter.c (modified)

	Fixed a bug that probably (can't test this now since it's down) broke ...


Wed, 21 Dec 2011 19:03:56 GMT Wilmer van der Gaast <wilmer@…> [31db8165]
	* lib/oauth.c (modified)

	Use sha1_hmac() instead of reimplementing the algorithm in
	oauth_sign().


Tue, 20 Dec 2011 16:42:17 GMT Wilmer van der Gaast <wilmer@…> [f9789d4]
	* lib/misc.c (modified)
	* lib/oauth2.c (modified)

	NULL-checking in rfc822_get_header() and OAuth response handling.


Mon, 19 Dec 2011 20:46:01 GMT Wilmer van der Gaast <wilmer@…> [9ff0c25]
	* lib/events_glib.c (modified)

	Catch condition=G_IO_NVAL from glib's event handler, which should ...


Mon, 19 Dec 2011 17:57:20 GMT Wilmer van der Gaast <wilmer@…> [a72dc2b]
	* lib/http_client.c (modified)
	* lib/ssl_bogus.c (modified)
	* lib/ssl_client.h (modified)
	* lib/ssl_gnutls.c (modified)
	* lib/ssl_nss.c (modified)
	* lib/ssl_openssl.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/skype/skype.c (modified)

	Add verify argument to ssl_connect() so HTTPS-based stuff is also ...


Mon, 19 Dec 2011 17:22:37 GMT Wilmer van der Gaast <wilmer@…> [78b8401]
	* lib/ssl_bogus.c (modified)
	* lib/ssl_client.h (modified)
	* lib/ssl_gnutls.c (modified)
	* lib/ssl_nss.c (modified)
	* lib/ssl_openssl.c (modified)
	* protocols/jabber/io.c (modified)

	Move conversion of status codes to status messages into SSL libs.


Mon, 19 Dec 2011 14:50:58 GMT Wilmer van der Gaast <wilmer@…> [486ddb5]
	* conf.c (modified)
	* conf.h (modified)
	* lib/http_client.c (modified)
	* lib/ssl_bogus.c (modified)
	* lib/ssl_client.h (modified)
	* lib/ssl_gnutls.c (modified)
	* lib/ssl_nss.c (modified)
	* lib/ssl_openssl.c (modified)
	* protocols/jabber/io.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/skype/skype.c (modified)

	Initial merge of tls_verify patch from AopicieR.


Mon, 19 Dec 2011 12:54:49 GMT Wilmer van der Gaast <wilmer@…> [36533bf]
	* lib/oauth.h (modified)
	* protocols/jabber/sasl.c (modified)

	When updating the XMPP password field with OAuth data, try harder to ...


Mon, 19 Dec 2011 00:41:40 GMT Wilmer van der Gaast <wilmer@…> [4be0e34]
	* lib/oauth.c (modified)
	* protocols/jabber/sasl.c (modified)

	Give a list of SASL mechanisms supported by a server when reporting ...


Mon, 19 Dec 2011 00:17:38 GMT Wilmer van der Gaast <wilmer@…> [bf57cd1]
	* lib/oauth.c (modified)
	* lib/oauth2.c (modified)

	Facebook OAuth2 should now be fully usable.


Mon, 19 Dec 2011 00:00:31 GMT Wilmer van der Gaast <wilmer@…> [9b0ad7e]
	* lib/misc.c (modified)
	* lib/misc.h (modified)
	* protocols/msn/msn.h (modified)
	* protocols/msn/msn_util.c (modified)
	* protocols/msn/ns.c (modified)
	* protocols/msn/sb.c (modified)

	Moving msn_findheader() to lib/misc.c as get_rfc822_header() so I can ...


Sun, 18 Dec 2011 19:25:44 GMT Wilmer van der Gaast <wilmer@…> [18c6d36]
	* lib/oauth2.c (modified)
	* lib/oauth2.h (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/jabber/sasl.c (modified)

	More generic OAuth support now. Should work well for all GTalk ...


Sat, 17 Dec 2011 13:50:01 GMT Wilmer van der Gaast <wilmer@…> [6e9ae72]
	* Makefile (modified)
	* bitlbee.h (modified)
	* configure (modified)
	* debian/bitlbee-plugin-skype.docs (added)
	* debian/changelog (modified)
	* debian/control (modified)
	* debian/rules (modified)
	* debian/skyped.README.Debian (added)
	* debian/skyped.docs (added)
	* doc/CHANGES (modified)
	* doc/user-guide/commands.xml (modified)
	* doc/user-guide/help.xsl (modified)
	* doc/user-guide/misc.xml (modified)
	* doc/user-guide/quickstart.xml (modified)
	* ipc.c (modified)
	* irc.c (modified)
	* irc.h (modified)
	* irc_commands.c (modified)
	* irc_im.c (modified)
	* irc_send.c (modified)
	* lib/http_client.c (modified)
	* lib/ssl_client.h (modified)
	* lib/ssl_gnutls.c (modified)
	* lib/ssl_nss.c (modified)
	* lib/ssl_openssl.c (modified)
	* lib/xmltree.c (modified)
	* nick.c (modified)
	* otr.c (modified)
	* protocols/jabber/io.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/s5bytestream.c (modified)
	* protocols/msn/ns.c (modified)
	* protocols/msn/sb.c (modified)
	* protocols/msn/soap.c (modified)
	* protocols/nogaim.c (modified)
	* protocols/oscar/chat.c (modified)
	* protocols/oscar/chatnav.c (modified)
	* protocols/oscar/icq.c (modified)
	* protocols/oscar/im.c (modified)
	* protocols/oscar/misc.c (modified)
	* protocols/oscar/oscar.c (modified)
	* protocols/oscar/rxqueue.c (modified)
	* protocols/oscar/service.c (modified)
	* protocols/purple/purple.c (modified)
	* protocols/skype/.bzrignore (added)
	* protocols/skype/.mailmap (added)
	* protocols/skype/HACKING (added)
	* protocols/skype/Makefile (added)
	* protocols/skype/NEWS (added)
	* protocols/skype/README (added)
	* protocols/skype/asciidoc.conf (added)
	* protocols/skype/client.sh (added)
	* protocols/skype/skype.c (added)
	* protocols/skype/skyped.cnf (added)
	* protocols/skype/skyped.conf.dist (added)
	* protocols/skype/skyped.py (added)
	* protocols/skype/skyped.txt (added)
	* protocols/skype/t/Makefile (added)
	* protocols/skype/t/bitlbee.conf (added)
	* protocols/skype/t/irssi/livetest-irssi.sh (added)
	* protocols/skype/t/irssi/skype-call.test (added)
	* protocols/skype/t/irssi/skype-info.test (added)
	* protocols/skype/t/irssi/skype-login.test (added)
	* protocols/skype/t/irssi/skype-msg.test (added)
	* protocols/skype/t/irssi/trigger.pl (added)
	* protocols/skype/t/livetest-bitlbee.sh (added)
	* protocols/twitter/twitter.c (modified)
	* protocols/twitter/twitter.h (modified)
	* protocols/twitter/twitter_lib.c (modified)
	* protocols/twitter/twitter_lib.h (modified)
	* protocols/yahoo/libyahoo2.c (modified)
	* query.c (modified)
	* root_commands.c (modified)
	* set.c (modified)
	* set.h (modified)
	* storage_xml.c (modified)

	Mainline merge.


Sun, 11 Dec 2011 16:38:02 GMT Wilmer van der Gaast <wilmer@…> [3f808ca]
	* lib/http_client.c (modified)
	* protocols/twitter/twitter.c (modified)

	Support HTTP/1.1 redirect status codes and use HTTPS for OAuth setup. ...


Sun, 04 Dec 2011 19:14:29 GMT Wilmer van der Gaast <wilmer@…> [ca974d7]
	* lib/ssl_gnutls.c (modified)
	* lib/xmltree.c (modified)
	* protocols/msn/soap.c (modified)

	Debug output tweaks: Try to send everything to stderr, and add ifdef ...


Fri, 02 Dec 2011 10:32:54 GMT Wilmer van der Gaast <wilmer@…> [bd31661]
	* lib/http_client.c (modified)
	* lib/xmltree.c (modified)
	* protocols/msn/soap.c (modified)

	Somewhat improve debug logging of HTTP/SOAP stuff.


Mon, 14 Nov 2011 10:43:03 GMT Wilmer van der Gaast <wilmer@…> [80acb6d]
	* lib/http_client.c (modified)
	* lib/ssl_client.h (modified)
	* lib/ssl_gnutls.c (modified)
	* lib/ssl_nss.c (modified)
	* lib/ssl_openssl.c (modified)

	GnuTLS now also needs ssl_pending() implemented. Bug #860.


Sun, 13 Nov 2011 01:41:42 GMT Wilmer van der Gaast <wilmer@…> [03a8f8e]
	* lib/http_client.c (modified)

	Cleanup of http_client fix. Use g_strdup_printf and completely avoid ...


Sat, 12 Nov 2011 15:49:52 GMT Wilmer van der Gaast <wilmer@…> [dff732d]
	* lib/http_client.c (modified)
	* protocols/msn/soap.h (modified)

	Undoing old workaround for MSN troubles and added more proper fix. ...


Fri, 21 Oct 2011 03:59:14 GMT Wilmer van der Gaast <wilmer@…> [e6b41b1]
	* lib/xmltree.c (modified)

	Strip illegal characters in generated XML streams so Jabber servers ...


Thu, 04 Aug 2011 18:52:53 GMT Wilmer van der Gaast <wilmer@…> [7732193]
	* lib/oauth2.c (modified)

	Had to change the OAuth secret for GTalk.


Sun, 31 Jul 2011 20:27:30 GMT Wilmer van der Gaast <wilmer@…> [f138bd2]
	* lib/oauth.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/sasl.c (modified)

	OAuth code cleanup.


Sun, 31 Jul 2011 15:44:37 GMT Wilmer van der Gaast <wilmer@…> [e1c926f]
	* lib/md5.c (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/jabber/sasl.c (modified)

	Facebook authentication. This isn't really OAuth in the end: FB ...


Sun, 31 Jul 2011 14:55:00 GMT Wilmer van der Gaast <wilmer@…> [39a939c]
	* lib/oauth2.c (modified)
	* lib/oauth2.h (modified)

	oauth2 changes to address ...


Sun, 31 Jul 2011 14:51:07 GMT Wilmer van der Gaast <wilmer@…> [aa9f1ac]
	* lib/oauth.c (modified)
	* lib/oauth.h (modified)

	Export oauth_params_parse().


Sun, 31 Jul 2011 14:40:41 GMT Wilmer van der Gaast <wilmer@…> [1174899]
	* lib/md5.c (modified)
	* lib/md5.h (modified)

	Having written the same stupid code (ASCII MD5 hashes) 205762 times, ...


Tue, 26 Jul 2011 11:58:38 GMT Wilmer van der Gaast <wilmer@…> [4a5d885]
	* lib/oauth.h (modified)
	* lib/oauth2.c (modified)
	* lib/oauth2.h (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/jabber/sasl.c (modified)

	Working OAuth2 support. Needs some more debugging (error handling is ...


Fri, 22 Jul 2011 18:29:25 GMT Wilmer van der Gaast <wilmer@…> [57b4525]
	* lib/Makefile (modified)
	* lib/oauth2.c (added)
	* lib/oauth2.h (added)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/sasl.c (modified)

	Nothing useful yet, this just generates an auth URL. Things to do: ...


Tue, 12 Jul 2011 08:04:12 GMT Wilmer van der Gaast <wilmer@…> [a010498]
	* lib/proxy.c (modified)

	Fixed dumb file descriptor leak.


Sat, 02 Jul 2011 16:34:42 GMT Wilmer van der Gaast <wilmer@…> [f5da476]
	* lib/misc.c (modified)

	Fixed use of g_iconv() in do_iconv(). This was done wrong for ages ...


Mon, 18 Apr 2011 14:14:28 GMT Wilmer van der Gaast <wilmer@…> [2423c93]
	* lib/http_client.c (modified)
	* lib/oauth.c (modified)

	Send Connection: close headers so webservers won't try keepalive ...


Mon, 18 Apr 2011 13:47:36 GMT Wilmer van der Gaast <wilmer@…> [d43d55a]
	* lib/ssl_gnutls.c (modified)

	Fix GnuTLS >2.12 or so compatibility.
	Bug #779 and ...


Sun, 27 Mar 2011 14:09:55 GMT Wilmer van der Gaast <wilmer@…> [ce617f0]
	* lib/oauth.c (modified)
	* protocols/twitter/twitter.c (modified)

	Tweaks to allow authenticating to identi.ca with OAuth. Doesn't seem ...


Tue, 08 Mar 2011 06:50:57 GMT Wilmer van der Gaast <wilmer@…> [420d80d1]
	* lib/ssl_bogus.c (modified)

	Removed duplicate ssl_pending from ssl_bogus.


Tue, 08 Mar 2011 06:24:34 GMT Wilmer van der Gaast <wilmer@…> [93cc86f]
	* lib/oauth.c (modified)
	* lib/oauth.h (modified)
	* protocols/twitter/twitter.c (modified)

	Twitter: Warn the user if the OAuth username and the configured ...


Sun, 19 Dec 2010 11:16:20 GMT Wilmer van der Gaast <wilmer@…> [31c28a4]
	* lib/ssl_nss.c (modified)

	Implement ssl_pending() for NSS. This fixes bug #368 which so far ...


Sat, 20 Nov 2010 15:13:40 GMT Wilmer van der Gaast <wilmer@…> [ef043d3]
	* configure (modified)
	* lib/ssl_nss.c (modified)

	Fix up NSS SSL module.


Sun, 24 Oct 2010 22:20:40 GMT Wilmer van der Gaast <wilmer@…> [389ce9f]
	* lib/proxy.c (modified)

	Another compatibility fix: AI_ADDRCONFIG doesn't exist on some
	systems.


Sun, 17 Oct 2010 06:44:35 GMT Wilmer van der Gaast <wilmer@…> [83e47ec]
	* configure (modified)
	* lib/ssl_gnutls.c (modified)

	Use gcrypt for 3DES encryption (used for new MSN authentication) so ...


Sat, 09 Oct 2010 18:41:19 GMT Wilmer van der Gaast <wilmer@…> [6197702]
	* Makefile (modified)
	* bitlbee.h (modified)
	* commands.h (modified)
	* configure (modified)
	* debian/control (modified)
	* debian/rules (modified)
	* doc/README (modified)
	* doc/user-guide/commands.xml (modified)
	* irc.c (modified)
	* irc.h (modified)
	* irc_commands.c (modified)
	* irc_im.c (modified)
	* lib/events.h (modified)
	* lib/events_glib.c (modified)
	* lib/misc.c (modified)
	* lib/ssl_bogus.c (modified)
	* lib/ssl_client.h (modified)
	* lib/ssl_gnutls.c (modified)
	* lib/ssl_nss.c (modified)
	* lib/ssl_openssl.c (modified)
	* log.c (modified)
	* log.h (modified)
	* nick.c (modified)
	* otr.c (added)
	* otr.h (added)
	* protocols/bee_user.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/msn/msn.c (modified)
	* protocols/nogaim.h (modified)
	* protocols/oscar/oscar.c (modified)
	* protocols/twitter/twitter.c (modified)
	* protocols/yahoo/yahoo.c (modified)
	* query.c (modified)
	* root_commands.c (modified)
	* sock.h (modified)
	* storage.c (modified)
	* unix.c (modified)

	Merging OTR branch. It's more or less a plugin if you enable it, and ...


Thu, 07 Oct 2010 06:25:35 GMT Wilmer van der Gaast <wilmer@…> [afb9ea9]
	* lib/ssl_gnutls.c (modified)
	* lib/xmltree.c (modified)
	* protocols/msn/soap.c (modified)

	Silencing some (mostly whiny) compiler warnings.


Sun, 03 Oct 2010 03:03:19 GMT Wilmer van der Gaast <wilmer@…> [25b5a4a]
	* lib/events.h (modified)
	* lib/events_glib.c (modified)
	* sock.h (modified)

	Make sure events_*.c are fully compatible to callers so plugins built ...


Sun, 03 Oct 2010 02:45:26 GMT Wilmer van der Gaast <wilmer@…> [8e9e2b7]
	* bitlbee.c (modified)
	* bitlbee.h (modified)
	* configure (modified)
	* doc/CHANGES (modified)
	* doc/FAQ (modified)
	* doc/README (modified)
	* doc/user-guide/commands.xml (modified)
	* doc/user-guide/misc.xml (modified)
	* help.c (modified)
	* help.h (modified)
	* irc.c (modified)
	* irc_channel.c (modified)
	* irc_commands.c (modified)
	* irc_im.c (modified)
	* irc_send.c (modified)
	* lib/Makefile (modified)
	* lib/des.c (added)
	* lib/des.h (added)
	* lib/misc.c (modified)
	* lib/sha1.c (modified)
	* lib/sha1.h (modified)
	* lib/ssl_client.h (modified)
	* lib/ssl_gnutls.c (modified)
	* lib/ssl_openssl.c (modified)
	* lib/xmltree.c (modified)
	* lib/xmltree.h (modified)
	* protocols/bee.h (modified)
	* protocols/bee_chat.c (modified)
	* protocols/bee_user.c (modified)
	* protocols/jabber/conference.c (modified)
	* protocols/msn/Makefile (modified)
	* protocols/msn/msn.c (modified)
	* protocols/msn/msn.h (modified)
	* protocols/msn/msn_util.c (modified)
	* protocols/msn/ns.c (modified)
	* protocols/msn/passport.c (deleted)
	* protocols/msn/passport.h (deleted)
	* protocols/msn/sb.c (modified)
	* protocols/msn/soap.c (added)
	* protocols/msn/soap.h (added)
	* protocols/msn/tables.c (modified)
	* protocols/nogaim.c (modified)
	* protocols/nogaim.h (modified)
	* protocols/oscar/ssi.c (modified)
	* protocols/purple/purple.c (modified)
	* protocols/twitter/twitter.c (modified)
	* root_commands.c (modified)
	* storage_xml.c (modified)
	* unix.c (modified)

	Merging mainline, which includes a huge msnp13 merge.

	Not 100% sure ...


Tue, 31 Aug 2010 20:06:14 GMT Wilmer van der Gaast <wilmer@…> [f5c0d8e]
	* .bzrignore (modified)
	* Makefile (modified)
	* configure (modified)
	* doc/user-guide/commands.xml (modified)
	* irc.h (modified)
	* irc_commands.c (modified)
	* irc_im.c (modified)
	* irc_send.c (modified)
	* lib/Makefile (modified)
	* protocols/Makefile (modified)
	* protocols/bee.h (modified)
	* protocols/bee_chat.c (modified)
	* protocols/jabber/Makefile (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/jabber/message.c (modified)
	* protocols/jabber/si.c (modified)
	* protocols/msn/Makefile (modified)
	* protocols/oscar/Makefile (modified)
	* protocols/oscar/oscar.c (modified)
	* protocols/purple/Makefile (modified)
	* protocols/twitter/Makefile (modified)
	* protocols/twitter/twitter.c (modified)
	* protocols/yahoo/Makefile (modified)
	* protocols/yahoo/libyahoo2.c (modified)
	* root_commands.c (modified)
	* utils/README (modified)
	* utils/centericq2bitlbee.sh (deleted)
	* utils/convert_gnomeicu.txt (deleted)
	* utils/convert_purple.py (added)
	* utils/create_nicksfile.pl (deleted)

	Merge mainline stuff.


Sat, 28 Aug 2010 12:24:37 GMT Wilmer van der Gaast <wilmer@…> [feb1bad]
	* .bzrignore (modified)
	* Makefile (modified)
	* configure (modified)
	* lib/Makefile (modified)
	* protocols/Makefile (modified)
	* protocols/jabber/Makefile (modified)
	* protocols/msn/Makefile (modified)
	* protocols/oscar/Makefile (modified)
	* protocols/purple/Makefile (modified)
	* protocols/twitter/Makefile (modified)
	* protocols/yahoo/Makefile (modified)

	Pull in Makefile dependencies fix from mainline.


Fri, 27 Aug 2010 08:48:18 GMT Wilmer van der Gaast <wilmer@…> [b0a89cc]
	* .bzrignore (modified)
	* Makefile (modified)
	* configure (modified)
	* lib/Makefile (modified)
	* protocols/Makefile (modified)
	* protocols/jabber/Makefile (modified)
	* protocols/msn/Makefile (modified)
	* protocols/oscar/Makefile (modified)
	* protocols/purple/Makefile (modified)
	* protocols/twitter/Makefile (modified)
	* protocols/yahoo/Makefile (modified)

	Use nifty gcc -MD feature to automatically track .h dependencies of ...


Mon, 23 Aug 2010 23:12:24 GMT Wilmer van der Gaast <wilmer@…> [be999a5]
	* bitlbee.h (modified)
	* configure (modified)
	* doc/README (modified)
	* doc/user-guide/commands.xml (modified)
	* irc.h (modified)
	* lib/misc.c (modified)
	* lib/ssl_bogus.c (modified)
	* lib/ssl_client.h (modified)
	* lib/ssl_gnutls.c (modified)
	* lib/ssl_nss.c (modified)
	* lib/ssl_openssl.c (modified)
	* log.c (modified)
	* log.h (modified)
	* otr.c (added)
	* otr.h (added)
	* protocols/jabber/jabber.c (modified)
	* protocols/msn/msn.c (modified)
	* protocols/nogaim.h (modified)
	* protocols/oscar/oscar.c (modified)
	* protocols/twitter/twitter.c (modified)
	* protocols/yahoo/yahoo.c (modified)
	* query.c (modified)
	* root_commands.c (modified)
	* storage.c (modified)
	* unix.c (modified)

	First step in this merge. Mostly a bzr merge and then a cleanup of ...


Sat, 21 Aug 2010 22:42:01 GMT Wilmer van der Gaast <wilmer@…> [4022b68]
	* debian/bitlbee-common.init (moved)
	* debian/bitlbee-common.postinst (moved)
	* debian/bitlbee-common.postrm (moved)
	* debian/bitlbee-common.prerm (added)
	* debian/bitlbee.prerm (modified)
	* debian/changelog (modified)
	* debian/rules (modified)
	* doc/user-guide/commands.xml (modified)
	* doc/user-guide/misc.xml (modified)
	* irc.c (modified)
	* irc_channel.c (modified)
	* irc_send.c (modified)
	* lib/proxy.c (modified)
	* protocols/bee.c (modified)
	* protocols/bee.h (modified)
	* protocols/bee_user.c (modified)
	* protocols/nogaim.h (modified)
	* protocols/oscar/oscar.c (modified)
	* protocols/purple/purple.c (modified)
	* protocols/yahoo/yahoo.c (modified)
	* root_commands.c (modified)
	* set.h (modified)

	Merge mainline.


Sat, 21 Aug 2010 17:27:32 GMT Wilmer van der Gaast <wilmer@…> [327af51]
	* doc/CHANGES (modified)
	* lib/ssl_gnutls.c (modified)
	* lib/ssl_openssl.c (modified)
	* lib/xmltree.c (modified)
	* protocols/msn/soap.c (modified)

	Some general cleanup, plus fixing a bug in the memberlist parsing ...


Fri, 20 Aug 2010 23:04:12 GMT Wilmer van der Gaast <wilmer@…> [a366cca]
	* configure (modified)
	* lib/Makefile (modified)
	* lib/des.c (added)
	* lib/des.h (added)

	Now including a nice and compact 3DES implementation done by ...


Fri, 20 Aug 2010 08:22:28 GMT Wilmer van der Gaast <wilmer@…> [f2520b5]
	* lib/xmltree.c (modified)
	* protocols/msn/soap.c (modified)

	In debugging mode, dump all SOAP requests + responses with some ...


Sun, 15 Aug 2010 22:07:57 GMT Wilmer van der Gaast <wilmer@…> [762d96f]
	* lib/proxy.c (modified)

	If a connection fails, try the next address from the getaddrinfo() ...


Sat, 14 Aug 2010 23:00:53 GMT Wilmer van der Gaast <wilmer@…> [d912fe4]
	* lib/xmltree.c (modified)
	* lib/xmltree.h (modified)

	Add xt_find_path() to simplify digging through multi-level XML trees.


Sat, 14 Aug 2010 13:44:35 GMT Wilmer van der Gaast <wilmer@…> [07874be]
	* doc/user-guide/commands.xml (modified)
	* irc.h (modified)
	* irc_channel.c (modified)
	* irc_im.c (modified)
	* irc_send.c (modified)
	* irc_user.c (modified)
	* lib/misc.c (modified)
	* lib/misc.h (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/twitter/twitter.c (modified)
	* protocols/twitter/twitter_lib.c (modified)
	* root_commands.c (modified)
	* sock.h (modified)

	Merge mainline stuff.


Sat, 14 Aug 2010 13:06:11 GMT Wilmer van der Gaast <wilmer@…> [4452e69]
	* lib/xmltree.c (modified)
	* protocols/msn/msn.c (modified)
	* protocols/msn/msn.h (modified)
	* protocols/msn/msn_util.c (modified)
	* protocols/msn/ns.c (modified)
	* protocols/msn/soap.c (modified)
	* protocols/msn/soap.h (modified)
	* protocols/nogaim.h (modified)
	* storage_xml.c (modified)

	Allow changing the display_name, now permanently!


Sat, 14 Aug 2010 12:20:59 GMT Wilmer van der Gaast <wilmer@…> [d93c0eb9]
	* lib/xmltree.c (modified)
	* lib/xmltree.h (modified)
	* protocols/bee.h (modified)
	* protocols/bee_user.c (modified)
	* protocols/msn/ns.c (modified)
	* protocols/msn/soap.h (modified)

	Read incoming MSN status/away messages.


Fri, 13 Aug 2010 09:12:54 GMT Wilmer van der Gaast <wilmer@…> [50b8978]
	* lib/ssl_gnutls.c (modified)
	* lib/ssl_openssl.c (modified)

	OpenSSL fixes + debugging.


Thu, 12 Aug 2010 22:44:56 GMT Wilmer van der Gaast <wilmer@…> [b46769d]
	* lib/xmltree.c (modified)
	* lib/xmltree.h (modified)
	* protocols/msn/ns.c (modified)
	* protocols/msn/sb.c (modified)

	Some syntax checking fixups; don't make the same mistake of failing ...


Wed, 11 Aug 2010 08:08:39 GMT Wilmer van der Gaast <wilmer@…> [523fb23]
	* lib/sha1.c (modified)
	* lib/sha1.h (modified)
	* lib/ssl_client.h (modified)
	* lib/ssl_openssl.c (modified)
	* protocols/msn/Makefile (modified)
	* protocols/msn/msn.c (modified)
	* protocols/msn/msn.h (modified)
	* protocols/msn/msn_util.c (modified)
	* protocols/msn/ns.c (modified)
	* protocols/msn/sb.c (modified)
	* protocols/msn/soap.c (modified)
	* protocols/msn/soap.h (modified)

	Implement MSNP15 SSO (Sadistic Sign-On).


Tue, 10 Aug 2010 11:18:09 GMT Wilmer van der Gaast <wilmer@…> [ffdf2e7]
	* lib/misc.c (modified)
	* lib/misc.h (modified)
	* protocols/jabber/jabber.c (modified)

	When doing SRV lookups, return an array with all RRs instead of just ...


Sun, 08 Aug 2010 15:34:49 GMT Wilmer van der Gaast <wilmer@…> [2528cda]
	* lib/misc.c (modified)
	* protocols/msn/Makefile (modified)
	* protocols/msn/msn.c (modified)
	* protocols/msn/msn.h (modified)
	* protocols/msn/msn_util.c (modified)
	* protocols/msn/ns.c (modified)
	* protocols/msn/sb.c (modified)
	* protocols/msn/soap.c (added)
	* protocols/msn/soap.h (added)

	Merging msn-offline branch. A tiny bit of MSNP13, and it works for ...


Sun, 08 Aug 2010 15:25:13 GMT Wilmer van der Gaast <wilmer@…> [ee6cc94]
	* lib/misc.c (modified)

	Use local memory in http_encode() instead of malloc().


Sat, 07 Aug 2010 19:39:01 GMT Wilmer van der Gaast <wilmer@…> [7b87539]
	* lib/misc.c (modified)
	* protocols/twitter/twitter.c (modified)
	* protocols/twitter/twitter.h (modified)
	* protocols/twitter/twitter_lib.c (modified)
	* protocols/twitter/twitter_lib.h (modified)

	Add commands to the Twitter module, starting with undo (which deletes ...


Sat, 07 Aug 2010 16:33:02 GMT Wilmer van der Gaast <wilmer@…> [daae10f]
	* Makefile (modified)
	* conf.c (modified)
	* configure (modified)
	* irc_commands.c (modified)
	* lib/Makefile (modified)
	* lib/md5.h (modified)
	* lib/oauth.c (modified)
	* lib/sha1.h (modified)
	* lib/xmltree.c (modified)
	* protocols/Makefile (modified)
	* protocols/jabber/Makefile (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/message.c (modified)
	* protocols/msn/Makefile (modified)
	* protocols/msn/msn.c (modified)
	* protocols/nogaim.c (modified)
	* protocols/nogaim.h (modified)
	* protocols/oscar/Makefile (modified)
	* protocols/twitter/Makefile (modified)
	* protocols/twitter/twitter_lib.c (modified)
	* protocols/yahoo/Makefile (modified)
	* protocols/yahoo/libyahoo2.c (modified)
	* unix.c (modified)

	OpenSolaris (non-gcc) fixes, patches from Dagobert Michelsen ...


Sat, 07 Aug 2010 14:55:18 GMT Wilmer van der Gaast <wilmer@…> [289bd2d]
	* lib/proxy.c (modified)

	Applied patch from wahjava (with some modifications) for bug #644. ...


Thu, 29 Jul 2010 08:57:01 GMT Wilmer van der Gaast <wilmer@…> [b40e60d]
	* lib/misc.c (modified)
	* tests/check.c (modified)
	* tests/check_util.c (modified)

	Fixing http_encode(): BitlBee now calls setlocale() (for nickname ...


Sat, 24 Jul 2010 22:50:23 GMT Wilmer van der Gaast <wilmer@…> [f1f7b5e]
	* dcc.c (modified)
	* lib/ftutil.c (modified)
	* lib/ftutil.h (modified)
	* protocols/jabber/s5bytestream.c (modified)

	Take the local address from the IM/IRC connection when setting up a ...


Fri, 16 Jul 2010 23:31:55 GMT Wilmer van der Gaast <wilmer@…> [4346c3f4]
	* bitlbee.h (modified)
	* debian/changelog (modified)
	* doc/CHANGES (modified)
	* doc/user-guide/commands.xml (modified)
	* lib/http_client.c (modified)
	* lib/http_client.h (modified)
	* protocols/oscar/oscar.c (modified)
	* protocols/twitter/twitter_lib.c (modified)
	* storage_xml.c (modified)

	Merging mainline.


Fri, 16 Jul 2010 23:11:37 GMT Wilmer van der Gaast <wilmer@…> [516a9c6]
	* lib/http_client.c (modified)
	* lib/http_client.h (modified)

	No idea why http_dorequest() ever returned void*. Don't hide the ...


Thu, 15 Jul 2010 23:23:04 GMT Wilmer van der Gaast <wilmer@…> [7885d0f]
	* lib/http_client.c (modified)
	* lib/http_client.h (modified)

	Don't be a dumbass and stop following redirects if there doesn't seem ...


Mon, 07 Jun 2010 14:31:07 GMT Wilmer van der Gaast <wilmer@…> [4aa0f6b]
	* Makefile (modified)
	* bitlbee.c (modified)
	* bitlbee.h (modified)
	* configure (modified)
	* dcc.c (modified)
	* debian/bitlbee-common.config (moved)
	* debian/bitlbee-common.docs (added)
	* debian/bitlbee-common.examples (added)
	* debian/bitlbee-common.templates (moved)
	* debian/bitlbee.init (modified)
	* debian/bitlbee.postinst (moved)
	* debian/bitlbee.postrm (moved)
	* debian/bitlbee.prerm (moved)
	* debian/changelog (modified)
	* debian/compat (added)
	* debian/conffiles (deleted)
	* debian/control (modified)
	* debian/patches/bitlbee.conf.diff (modified)
	* debian/po/POTFILES.in (modified)
	* debian/rules (modified)
	* doc/Makefile (modified)
	* doc/user-guide/Makefile (modified)
	* help.c (modified)
	* help.h (modified)
	* ipc.c (modified)
	* irc.c (modified)
	* lib/Makefile (modified)
	* lib/events.h (modified)
	* lib/events_glib.c (modified)
	* lib/events_libevent.c (modified)
	* lib/http_client.c (modified)
	* lib/proxy.c (modified)
	* lib/ssl_bogus.c (modified)
	* lib/ssl_client.h (modified)
	* lib/ssl_gnutls.c (modified)
	* lib/ssl_nss.c (modified)
	* lib/ssl_openssl.c (modified)
	* lib/ssl_sspi.c (modified)
	* protocols/Makefile (modified)
	* protocols/jabber/Makefile (modified)
	* protocols/jabber/io.c (modified)
	* protocols/jabber/s5bytestream.c (modified)
	* protocols/msn/Makefile (modified)
	* protocols/msn/invitation.c (modified)
	* protocols/msn/ns.c (modified)
	* protocols/msn/sb.c (modified)
	* protocols/nogaim.c (modified)
	* protocols/nogaim.h (modified)
	* protocols/oscar/Makefile (modified)
	* protocols/oscar/auth.c (modified)
	* protocols/oscar/oscar.c (modified)
	* protocols/purple/Makefile (added)
	* protocols/purple/ft-direct.c (added)
	* protocols/purple/ft.c (added)
	* protocols/purple/purple.c (added)
	* protocols/twitter/Makefile (modified)
	* protocols/yahoo/Makefile (modified)
	* protocols/yahoo/yahoo.c (modified)
	* set.c (modified)
	* set.h (modified)
	* tests/Makefile (modified)
	* unix.c (modified)

	Merging killerbee stuff, bringing all the bleeding-edge stuff
	together.


Sat, 05 Jun 2010 23:26:07 GMT Wilmer van der Gaast <wilmer@…> [1fdb0a4]
	* bitlbee.h (modified)
	* debian/changelog (modified)
	* debian/control (modified)
	* doc/CHANGES (modified)
	* doc/bitlbee.8 (modified)
	* doc/user-guide/commands.xml (modified)
	* doc/user-guide/quickstart.xml (modified)
	* irc_commands.c (modified)
	* lib/misc.c (modified)
	* protocols/jabber/iq.c (modified)
	* protocols/msn/passport.c (modified)
	* protocols/oscar/auth.c (modified)
	* protocols/oscar/oscar.c (modified)
	* protocols/twitter/twitter.c (modified)
	* protocols/twitter/twitter.h (modified)
	* protocols/twitter/twitter_http.c (modified)
	* protocols/twitter/twitter_http.h (modified)
	* protocols/twitter/twitter_lib.c (modified)
	* protocols/twitter/twitter_lib.h (modified)

	Merging mainline.


Thu, 03 Jun 2010 22:08:23 GMT Sven Moritz Hallberg <pesco@…> [3759849]
	* debian/changelog (modified)
	* debian/control (modified)
	* debian/rules (modified)
	* doc/bitlbee.8 (modified)
	* doc/user-guide/commands.xml (modified)
	* doc/user-guide/quickstart.xml (modified)
	* irc_commands.c (modified)
	* lib/misc.c (modified)
	* protocols/jabber/iq.c (modified)
	* protocols/oscar/auth.c (modified)
	* protocols/oscar/oscar.c (modified)
	* protocols/twitter/twitter.c (modified)
	* protocols/twitter/twitter.h (modified)
	* protocols/twitter/twitter_http.c (modified)
	* protocols/twitter/twitter_http.h (modified)
	* protocols/twitter/twitter_lib.c (modified)
	* protocols/twitter/twitter_lib.h (modified)

	merge in bitlbee head


Thu, 03 Jun 2010 21:13:57 GMT Sven Moritz Hallberg <pesco@…> [bb09b3c]
	* bitlbee.h (modified)
	* debian/changelog (modified)
	* debian/rules (modified)
	* doc/CHANGES (modified)
	* doc/user-guide/commands.xml (modified)
	* irc.c (modified)
	* lib/Makefile (modified)
	* lib/misc.c (modified)
	* lib/oauth.c (added)
	* lib/oauth.h (added)
	* lib/url.c (modified)
	* lib/url.h (modified)
	* lib/xmltree.c (modified)
	* protocols/jabber/conference.c (modified)
	* protocols/msn/passport.c (modified)
	* protocols/msn/sb.c (modified)
	* protocols/nogaim.c (modified)
	* protocols/oscar/oscar.c (modified)
	* protocols/twitter/twitter.c (modified)
	* protocols/twitter/twitter.h (modified)
	* protocols/twitter/twitter_http.c (modified)
	* protocols/twitter/twitter_http.h (modified)
	* protocols/twitter/twitter_lib.c (modified)
	* protocols/yahoo/yahoo.c (modified)

	merge in bitlbee 1.2.7


Thu, 03 Jun 2010 11:00:45 GMT Sven Moritz Hallberg <pesco@…> [814aa52]
	* Makefile (modified)
	* bitlbee.c (modified)
	* bitlbee.h (modified)
	* conf.c (modified)
	* configure (modified)
	* debian/bitlbee.init (modified)
	* debian/changelog (modified)
	* debian/config (modified)
	* debian/control (modified)
	* debian/patches/bitlbee.conf.diff (modified)
	* debian/po/POTFILES.in (modified)
	* debian/po/ru.po (added)
	* debian/postinst (modified)
	* debian/prerm (modified)
	* doc/CHANGES (modified)
	* doc/user-guide/commands.xml (modified)
	* irc.c (modified)
	* irc_commands.c (modified)
	* lib/misc.c (modified)
	* lib/misc.h (modified)
	* log.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/jabber/jabber_util.c (modified)
	* protocols/jabber/message.c (modified)
	* protocols/jabber/presence.c (modified)
	* protocols/msn/msn.c (modified)
	* protocols/msn/msn.h (modified)
	* protocols/msn/msn_util.c (modified)
	* protocols/msn/ns.c (modified)
	* protocols/msn/sb.c (modified)
	* protocols/nogaim.c (modified)
	* protocols/nogaim.h (modified)
	* protocols/oscar/oscar.c (modified)
	* protocols/twitter/Makefile (added)
	* protocols/twitter/twitter.c (added)
	* protocols/twitter/twitter.h (added)
	* protocols/twitter/twitter_http.c (added)
	* protocols/twitter/twitter_http.h (added)
	* protocols/twitter/twitter_lib.c (added)
	* protocols/twitter/twitter_lib.h (added)
	* root_commands.c (modified)
	* storage_xml.c (modified)
	* tests/check_jabber_util.c (modified)
	* unix.c (modified)

	merge in bitlbee 1.2.6


Thu, 03 Jun 2010 10:41:03 GMT Sven Moritz Hallberg <pesco@…> [5f8ab6a9]
	* Makefile (modified)
	* account.c (modified)
	* account.h (modified)
	* bitlbee.c (modified)
	* bitlbee.conf (modified)
	* bitlbee.h (modified)
	* chat.c (modified)
	* chat.h (modified)
	* conf.c (modified)
	* conf.h (modified)
	* configure (modified)
	* crypting.c (modified)
	* doc/CHANGES (modified)
	* doc/user-guide/commands.xml (modified)
	* doc/user-guide/misc.xml (modified)
	* irc.c (modified)
	* irc_commands.c (modified)
	* lib/misc.c (modified)
	* lib/misc.h (modified)
	* protocols/jabber/io.c (modified)
	* protocols/jabber/iq.c (modified)
	* protocols/jabber/jabber.c (modified)
	* protocols/jabber/jabber.h (modified)
	* protocols/jabber/jabber_util.c (modified)
	* protocols/jabber/presence.c (modified)
	* protocols/msn/msn.c (modified)
	* protocols/msn/msn.h (modified)
	* protocols/msn/msn_util.c (modified)
	* protocols/msn/ns.c (modified)
	* protocols/msn/tables.c (modified)
	* protocols/nogaim.c (modified)
	* protocols/nogaim.h (modified)
	* protocols/oscar/oscar.c (modified)
	* protocols/yahoo/libyahoo2.c (modified)
	* protocols/yahoo/yahoo.c (modified)
	* protocols/yahoo/yahoo2_types.h (modified)
	* root_commands.c (modified)
	* storage_xml.c (modified)
	* unix.c (modified)
	* user.h (modified)

	merge in bitlbee 1.2.5


Thu, 03 Jun 2010 10:31:46 GMT Sven Moritz Hallberg <pesco@…> [3f81999]
	* bitlbee.h (modified)
	* doc/CHANGES (modified)
	* doc/user-guide/commands.xml (modified)
	* irc_commands.c (modified)
	* lib/ini.c (modified)
	* protocols/jabber/conference.c (modified)
	* protocols/jabber/iq.c (modified)
	* protocols/nogaim.c (modified)
	* protocols/nogaim.h (modified)
	* protocols/oscar/aim.h (modified)
	* protocols/yahoo/libyahoo2.c (modified)
	* protocols/yahoo/yahoo.c (modified)
	* protocols/yahoo/yahoo2.h (modified)
	* protocols/yahoo/yahoo2_callbacks.h (modified)
	* protocols/yahoo/yahoo2_types.h (modified)
	* root_commands.c (modified)

	merge in bitlbee 1.2.4


Tue, 25 May 2010 22:26:54 GMT Wilmer van der Gaast <wilmer@…> [f60079b]
	* Makefile (modified)
	* bitlbee.h (modified)
	* configure (modified)
	* doc/Makefile (modified)
	* doc/user-guide/Makefile (modified)
	* lib/Makefile (modified)
	* protocols/Makefile (modified)
	* protocols/jabber/Makefile (modified)
	* protocols/msn/Makefile (modified)
	* protocols/oscar/Makefile (modified)
	* protocols/purple/Makefile (modified)
	* protocols/twitter/Makefile (modified)
	* protocols/yahoo/Makefile (modified)
	* tests/Makefile (modified)

	Allow one to run the configure script from a different directory and ...


Wed, 19 May 2010 19:46:43 GMT Wilmer van der Gaast <wilmer@…> [0b3ffb1]
	* lib/misc.c (modified)
	* protocols/twitter/twitter.c (modified)
	* protocols/twitter/twitter_lib.c (modified)

	Setting the HTML flag on a connection has a nasty side effect of ...


Sat, 15 May 2010 23:28:16 GMT Wilmer van der Gaast <wilmer@…> [ec86b22]
	* doc/user-guide/commands.xml (modified)
	* irc.c (modified)
	* lib/Makefile (modified)
	* lib/misc.c (modified)
	* lib/oauth.c (added)
	* lib/oauth.h (added)
	* lib/url.c (modified)
	* lib/url.h (modified)
	* lib/xmltree.c (modified)
	* protocols/jabber/conference.c (modified)
	* protocols/msn/sb.c (modified)
	* protocols/nogaim.c (modified)
	* protocols/oscar/oscar.c (modified)
	* protocols/twitter/twitter.c (modified)
	* protocols/twitter/twitter.h (modified)
	* protocols/twitter/twitter_http.c (modified)
	* protocols/twitter/twitter_http.h (modified)
	* protocols/twitter/twitter_lib.c (modified)
	* protocols/yahoo/yahoo.c (modified)

	Mainline merge. (Probably mostly irrelevant for this branch, oh
	well.)


Tue, 01 Jun 2010 21:51:27 GMT Wilmer van der Gaast <wilmer@…> [704dd38]
	* bitlbee.h (modified)
	* debian/changelog (modified)
	* debian/control (modified)
	* debian/rules (modified)
	* doc/CHANGES (modified)
	* doc/bitlbee.8 (modified)
	* doc/user-guide/commands.xml (modified)
	* doc/user-guide/quickstart.xml (modified)
	* lib/misc.c (modified)
	* protocols/jabber/iq.c (modified)
	* protocols/msn/passport.c (modified)
	* protocols/oscar/oscar.c (modified)
	* protocols/twitter/twitter.c (modified)
	* protocols/twitter/twitter.h (modified)
	* protocols/twitter/twitter_http.c (modified)
	* protocols/twitter/twitter_http.h (modified)
	* protocols/twitter/twitter_lib.c (modified)
	* protocols/twitter/twitter_lib.h (modified)
	* protocols/yahoo/yahoo.c (modified)

	Merging head.


Thu, 13 May 2010 22:05:13 GMT Wilmer van der Gaast <wilmer@…> [3429b58]
	* lib/xmltree.c (modified)
	* protocols/jabber/conference.c (modified)
	* protocols/msn/sb.c (modified)
	* protocols/oscar/oscar.c (modified)

	Mainline merge.


Tue, 11 May 2010 23:27:11 GMT Wilmer van der Gaast <wilmer@…> [3742fb6]
	* lib/xmltree.c (modified)

	Implement some kind of ignorant awareness of XML namespaces: Enough ...


Mon, 03 May 2010 00:52:08 GMT Wilmer van der Gaast <wilmer@…> [f924563]
	* bitlbee.c (modified)
	* bitlbee.h (modified)
	* debian/bitlbee.init (modified)
	* debian/changelog (modified)
	* debian/rules (modified)
	* doc/CHANGES (modified)
	* doc/user-guide/commands.xml (modified)
	* lib/Makefile (modified)
	* lib/misc.c (modified)
	* lib/oauth.c (added)
	* lib/oauth.h (added)
	* lib/url.c (modified)
	* lib/url.h (modified)
	* protocols/msn/msn.c (modified)
	* protocols/msn/msn.h (modified)
	* protocols/msn/ns.c (modified)
	* protocols/msn/sb.c (modified)
	* protocols/twitter/twitter.c (modified)
	* protocols/twitter/twitter.h (modified)
	* protocols/twitter/twitter_http.c (modified)
	* protocols/twitter/twitter_http.h (modified)
	* protocols/twitter/twitter_lib.c (modified)

	Mainline merge.


Sun, 02 May 2010 21:20:09 GMT Wilmer van der Gaast <wilmer@…> [3b878a1]
	* lib/oauth.c (modified)
	* lib/oauth.h (modified)
	* protocols/twitter/twitter.c (modified)
	* protocols/twitter/twitter.h (modified)
	* protocols/twitter/twitter_http.c (modified)
	* protocols/twitter/twitter_http.h (modified)
	* protocols/twitter/twitter_lib.c (modified)

	OAuth sanity fix: Twitter-specific stuff should *not* be in ...


Sat, 01 May 2010 14:10:32 GMT Wilmer van der Gaast <wilmer@…> [f4b0911]
	* lib/oauth.c (modified)
	* lib/oauth.h (modified)
	* protocols/twitter/twitter.c (modified)

	Save the credentials again.


Sat, 01 May 2010 13:53:59 GMT Wilmer van der Gaast <wilmer@…> [c2ecadc]
	* lib/oauth.c (modified)
	* lib/oauth.h (modified)
	* protocols/twitter/twitter.c (modified)
	* protocols/twitter/twitter.h (modified)
	* protocols/twitter/twitter_http.c (modified)
	* protocols/twitter/twitter_http.h (modified)
	* protocols/twitter/twitter_lib.c (modified)

	Cleaned up OAuth stuff: consumer key/secret should *not* be in ...