3 Commits

Author	SHA1	Message	Date
Craig Andrews	39392e03a7	Merge branch '0.9.x' into 1.0.x ... Conflicts: actions/confirmaddress.php actions/imsettings.php	2010-04-18 19:21:15 -04:00
Craig Andrews	20d6a7caed	Merge branch '0.9.x' into 1.0.x ... Conflicts: lib/queuemanager.php lib/xmppmanager.php plugins/Xmpp/Fake_XMPP.php scripts/imdaemon.php	2010-02-16 13:15:09 -05:00
Craig Andrews	e9995b0f6a	Create IM plugin, Pluginize XMPP, Create AIM plugin	2010-01-27 13:48:35 -05:00