#
# ChangeLog for /
#
# Generated by Trac 1.2.3
# 2024-05-18T14:42:01Z

Mon, 09 Jun 2008 01:52:28 GMT Jelmer Vernooij <jelmer@…> [c4a1036]
	* bitlbee.c (modified)
	* bitlbee.conf (modified)
	* bitlbee.h (modified)
	* conf.c (modified)
	* conf.h (modified)
	* debian/changelog (modified)
	* debian/control (modified)
	* debian/rules (modified)
	* doc/user-guide/commands.xml (modified)
	* irc.c (modified)
	* lib/arc.h (modified)
	* lib/proxy.c (modified)
	* protocols/jabber/jabber_util.c (modified)
	* protocols/msn/msn.h (modified)
	* protocols/msn/msn_util.c (modified)
	* protocols/msn/ns.c (modified)
	* protocols/nogaim.c (modified)
	* protocols/nogaim.h (modified)
	* protocols/oscar/oscar.c (modified)
	* protocols/yahoo/yahoo.c (modified)
	* query.c (modified)
	* query.h (modified)
	* root_commands.c (modified)

	Merge integration branch.


Wed, 21 May 2008 10:28:34 GMT Jelmer Vernooij <jelmer@…> [783e9b7]
	* bitlbee.c (modified)
	* bitlbee.conf (modified)
	* bitlbee.h (modified)
	* conf.c (modified)
	* conf.h (modified)
	* debian/changelog (modified)
	* debian/control (modified)
	* debian/rules (modified)
	* doc/user-guide/commands.xml (modified)
	* irc.c (modified)
	* lib/arc.h (modified)
	* lib/proxy.c (modified)
	* protocols/jabber/jabber_util.c (modified)
	* protocols/msn/msn.h (modified)
	* protocols/msn/msn_util.c (modified)
	* protocols/msn/ns.c (modified)
	* protocols/nogaim.c (modified)
	* protocols/nogaim.h (modified)
	* protocols/oscar/oscar.c (modified)
	* protocols/yahoo/yahoo.c (modified)
	* query.c (modified)
	* query.h (modified)
	* root_commands.c (modified)

	Merge trunk.