From: Luke Fitzgerald <lw.fitzgerald@googlemail.com>
Date: Thu, 12 Aug 2010 19:00:42 +0000 (-0700)
Subject: Merge branch 'idle-irc-plugin' into irc-plugin
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ed1ea2f0868bc9186f40a1b981591b300337937d;p=quix0rs-gnu-social.git

Merge branch 'idle-irc-plugin' into irc-plugin

Conflicts:
	plugins/Irc/ircmanager.php
---

ed1ea2f0868bc9186f40a1b981591b300337937d