Valentin Lorentz e92b8a62f5 Merge supybot's master (will make future merges easier)
Conflicts:
	plugins/Misc/plugin.py
	plugins/String/plugin.py
	src/drivers/Socket.py
	src/irclib.py
	src/ircutils.py
2012-04-03 16:55:29 +02:00
..
2012-03-16 18:28:05 +01:00
2012-03-11 21:06:19 +00:00

Insert a description of your plugin here, with any notes, etc. about using it.