Valentin Lorentz 487f8c8af5 Merge remote-tracking branch 'supybot/master' into testing
Conflicts:
	.mailmap
	README
	docs/FAQ.rst
	plugins/Ctcp/plugin.py
	plugins/Misc/plugin.py
	plugins/Network/plugin.py
	plugins/QuoteGrabs/plugin.py
	plugins/RSS/README.txt
	plugins/Relay/plugin.py
	plugins/ShrinkUrl/config.py
	plugins/ShrinkUrl/plugin.py
	plugins/ShrinkUrl/test.py
	setup.py
	src/callbacks.py
	src/commands.py
	src/conf.py
	test/test_commands.py
2015-05-15 14:41:08 +02:00
..
2015-04-26 22:20:24 -07:00
2015-01-01 19:38:37 +02:00
2014-12-20 14:37:27 +01:00
2015-01-23 08:27:50 +02:00
2014-08-04 15:12:17 +02:00
2014-12-20 14:37:27 +01:00
2014-12-20 14:37:27 +01:00
2014-12-20 14:37:27 +01:00
2015-01-17 02:49:30 -05:00
2014-12-20 14:37:27 +01:00
2014-12-20 14:37:27 +01:00
2014-12-20 14:37:27 +01:00
2014-12-20 14:37:27 +01:00
2014-06-08 16:59:42 +02:00
2014-12-27 10:46:58 -08:00
2014-11-27 22:53:08 -08:00
2014-12-20 14:37:27 +01:00
2014-12-20 14:37:27 +01:00
2014-12-20 14:37:27 +01:00
2014-12-20 14:37:27 +01:00