53 Commits

Author	SHA1	Message	Date
Craig Andrews	714d920fae	Merge branch '0.9.x' into 1.0.x ... Conflicts: classes/statusnet.ini db/statusnet.sql lib/jabber.php lib/xmppmanager.php	2010-03-08 17:22:23 -05:00
Craig Andrews	c187bf5597	Merge branch '0.9.x' into 1.0.x ... Conflicts: EVENTS.txt db/statusnet.sql lib/queuemanager.php	2010-02-24 20:52:45 -05:00
Craig Andrews	e9995b0f6a	Create IM plugin, Pluginize XMPP, Create AIM plugin	2010-01-27 13:48:35 -05:00