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
..
__init__.py	Merge remote-tracking branch 'supybot/master' into testing	2013-08-24 11:28:29 +02:00
crypt.py	Remove code specific to Python 2.{3,4,5}.	2013-05-13 15:27:26 +02:00
error.py	Change the modeline to use softtabstop instead of tabstop.	2006-02-11 15:52:51 +00:00
file.py	Merge remote-tracking branch 'supybot/master' into testing	2013-08-24 11:28:29 +02:00
gen.py	Merge remote-tracking branch 'supybot/master' into testing	2013-08-24 11:28:29 +02:00
iter.py	Merge remote-tracking branch 'supybot/master' into testing	2013-08-24 11:28:29 +02:00
net.py	Merge remote-tracking branch 'supybot/master' into testing	2013-08-24 11:28:29 +02:00
python.py	Remove code specific to Python 2.{3,4,5}.	2013-05-13 15:27:26 +02:00
seq.py	add damerau-levenshtein distance to supybot.utils.seq	2011-02-25 18:36:09 +01:00
str.py	Merge remote-tracking branch 'supybot/master' into testing	2013-08-24 11:28:29 +02:00
structures.py	utils.structures: Prevent a RingBuffer from being bigger than the new size, when calling resize().	2012-12-27 12:22:14 +00:00
transaction.py	Merge remote-tracking branch 'supybot/master' into testing	2013-08-24 11:28:29 +02:00
web.py	Merge remote-tracking branch 'supybot/master' into testing	2013-08-24 11:28:29 +02:00