Merge remote-tracking branch 'supybot/maint/0.83.4' into testing

Browse Source

Conflicts:
	INSTALL
	plugins/Channel/plugin.py
	plugins/Success/plugin.py

...

This commit is contained in:

Valentin Lorentz 2012-06-09 19:26:42 +02:00

parent 228e958362 6d1b957e07

commit 144c9e287b

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available