Valentin Lorentz 3dba9088b0 Merge remote-tracking branch 'supybot/master' into testing ...

Conflicts:
	INSTALL
	plugins/ChannelLogger/README.txt
	plugins/ChannelStats/README.txt
	plugins/Google/plugin.py
	plugins/Google/test.py
	plugins/Plugin/test.py
	plugins/Web/test.py
	setup.py
	src/callbacks.py
	src/ircdb.py
	src/irclib.py
	src/utils/str.py
	test/test_irclib.py

2013-01-01 21:11:24 +01:00

..

Admin

Rename all 'locale' directories to 'locales'.

2012-12-26 15:43:35 +01:00

Alias

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

Anonymous

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

AutoMode

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

BadWords

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

Channel

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

ChannelLogger

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

ChannelStats

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

Conditional

Rename all 'locale' directories to 'locales'.

2012-12-26 15:43:35 +01:00

Config

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

Ctcp

Rename all 'locale' directories to 'locales'.

2012-12-26 15:43:35 +01:00

Dict

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

Dunno

Rename all 'locale' directories to 'locales'.

2012-12-26 15:43:35 +01:00

Factoids

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

Filter

Rename all 'locale' directories to 'locales'.

2012-12-26 15:43:35 +01:00

Format

Rename all 'locale' directories to 'locales'.

2012-12-26 15:43:35 +01:00

Games

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

Google

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

Herald

Rename all 'locale' directories to 'locales'.

2012-12-26 15:43:35 +01:00

Internet

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

Karma

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

Lart

Rename all 'locale' directories to 'locales'.

2012-12-26 15:43:35 +01:00

Later

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

Limiter

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

Math

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

MessageParser

Rename all 'locale' directories to 'locales'.

2012-12-26 15:43:35 +01:00

Misc

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

MoobotFactoids

Rename all 'locale' directories to 'locales'.

2012-12-26 15:43:35 +01:00

Network

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

News

Rename all 'locale' directories to 'locales'.

2012-12-26 15:43:35 +01:00

NickAuth

Rename all 'locale' directories to 'locales'.

2012-12-26 15:43:35 +01:00

NickCapture

Rename all 'locale' directories to 'locales'.

2012-12-26 15:43:35 +01:00

Nickometer

Rename all 'locale' directories to 'locales'.

2012-12-26 15:43:35 +01:00

Note

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

Owner

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

Plugin

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

PluginDownloader

Rename all 'locale' directories to 'locales'.

2012-12-26 15:43:35 +01:00

Praise

Rename all 'locale' directories to 'locales'.

2012-12-26 15:43:35 +01:00

Protector

Rename all 'locale' directories to 'locales'.

2012-12-26 15:43:35 +01:00

Quote

Rename all 'locale' directories to 'locales'.

2012-12-26 15:43:35 +01:00

QuoteGrabs

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

Relay

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

Reply

Rename all 'locale' directories to 'locales'.

2012-12-26 15:43:35 +01:00

RSS

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

Scheduler

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

Seen

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

Services

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

ShrinkUrl

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

Status

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

String

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

Success

Rename all 'locale' directories to 'locales'.

2012-12-26 15:43:35 +01:00

Time

Rename all 'locale' directories to 'locales'.

2012-12-26 15:43:35 +01:00

Todo

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

Topic

Rename all 'locale' directories to 'locales'.

2012-12-26 15:43:35 +01:00

Unix

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

URL

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

User

Rename all 'locale' directories to 'locales'.

2012-12-26 15:43:35 +01:00

Utilities

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

Web

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00

__init__.py

Merge remote-tracking branch 'supybot/master' into testing

2013-01-01 21:11:24 +01:00