Valentin Lorentz 6f19088724 Merge remote-tracking branch 'supybot/master' into testing
Conflicts:
	.gitignore
	plugins/Alias/plugin.py
	plugins/Anonymous/plugin.py
	plugins/Anonymous/test.py
	setup.py
	src/callbacks.py
2014-07-12 09:48:27 +02:00
..
2014-04-11 21:56:42 +00:00
2014-06-08 13:54:09 +03:00
2014-06-08 13:07:36 +03:00
2014-07-10 23:07:35 +03:00
2014-06-08 16:59:42 +02:00
2014-06-08 13:07:36 +03:00
2014-06-08 13:07:36 +03:00
2014-06-08 13:07:36 +03:00
2014-06-08 16:59:42 +02:00
2014-06-08 13:07:36 +03:00
2014-06-08 13:07:36 +03:00