James Lu 0d41e35d9c Merge branch 'devel' into wip/handle-ts-bursts ...

Conflicts:
	plugins/relay.py

2015-08-15 19:28:49 -07:00

..

admin.py

plugins/admin: fix command help for 'mode'

2015-08-15 05:12:20 -07:00

commands.py

utils.isOper: check for both umode +o and login status

2015-08-02 19:41:40 -07:00

hooks.py

everything: Improve logging

2015-07-05 13:44:48 -07:00

relay.py

Merge branch 'devel' into wip/handle-ts-bursts

2015-08-15 19:28:49 -07:00