Merge branch 'automode-conf' into maint/0.83.4

This commit is contained in:
James McCoy 2011-10-22 16:06:57 -04:00
commit 58eee3c995

View File

@ -30,6 +30,7 @@
import time import time
import supybot.conf as conf
import supybot.ircdb as ircdb import supybot.ircdb as ircdb
import supybot.ircmsgs as ircmsgs import supybot.ircmsgs as ircmsgs
import supybot.ircutils as ircutils import supybot.ircutils as ircutils