Valentin Lorentz 40675ffdfa Merge remote-tracking branch 'supybot/master' into testing ... Conflicts: plugins/Admin/plugin.py plugins/BadWords/config.py plugins/Filter/plugin.py plugins/Google/plugin.py plugins/Math/plugin.py plugins/Misc/plugin.py plugins/Note/plugin.py plugins/RSS/plugin.py plugins/Seen/test.py plugins/ShrinkUrl/config.py plugins/ShrinkUrl/plugin.py plugins/ShrinkUrl/test.py plugins/Status/plugin.py plugins/String/config.py plugins/String/plugin.py plugins/Time/plugin.py plugins/Todo/plugin.py plugins/Web/plugin.py plugins/__init__.py scripts/supybot-botchk setup.py src/__init__.py src/callbacks.py src/commands.py src/conf.py src/drivers/Socket.py src/ircdb.py src/irclib.py src/ircutils.py src/questions.py src/registry.py src/schedule.py src/test.py src/utils/file.py src/utils/gen.py src/utils/net.py src/utils/web.py src/world.py		2013-08-24 11:28:29 +02:00
..
locales	Misc: Fix previous commit.	2013-07-13 11:54:44 +02:00
__init__.py	Moved the appropriate commands from Misc to Plugin, and fixed the test failures in the process.	2005-02-18 06:31:26 +00:00
config.py	Misc: Add supybot.plugins.Misc.mores.	2013-04-10 17:26:55 +02:00
messages.pot	Admin & Factoids & Google & Later & Misc & NickAuth & RSS & Seen & User & Web: Update messages.pot	2013-07-25 11:39:06 +02:00
plugin.py	Merge remote-tracking branch 'supybot/master' into testing	2013-08-24 11:28:29 +02:00
test.py	Misc: Add supybot.plugins.Misc.mores.	2013-04-10 17:26:55 +02:00