summaryrefslogtreecommitdiff
path: root/scripts/imdaemon.php
AgeCommit message (Collapse)Author
2010-03-22Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.xBrion Vibber
Conflicts: lib/channel.php scripts/imdaemon.php
2010-02-16Merge branch '0.9.x' into 1.0.xCraig Andrews
Conflicts: lib/queuemanager.php lib/xmppmanager.php plugins/Xmpp/Fake_XMPP.php scripts/imdaemon.php
2010-01-27Merge branch '0.9.x' into 1.0.xCraig Andrews
Conflicts: lib/queuemanager.php
2010-01-27Create IM plugin, Pluginize XMPP, Create AIM pluginCraig Andrews