Limnoria/sandbox
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
..
Debug Merge remote-tracking branch 'supybot/master' into testing 2013-08-24 11:28:29 +02:00
check_trans.py sandbox: Update check_trans.py to handle core locales. 2013-04-21 15:57:17 +02:00
release.py release: Fix repository location 2012-06-17 10:44:54 -04:00
update_plugins_messagespot.py Add script sandbox/update_plugins_messagespot.py. 2013-07-27 00:51:31 +02:00
update-version sandbox/update-version: Simplify logic in updating version while still using UTC time. 2012-01-06 18:38:24 +01:00