James Lu 886994475d Merge branch 'master' into wip/unrealircd ... Conflicts: classes.py		2015-09-23 18:59:17 -07:00
..
inspircd.py	TS6SIDGenerator: take an IRC object, and skip any SIDs that are currently in use	2015-09-20 18:32:43 -07:00
ts6_common.py	relay/ts6_common: be more error tolerant with network (dis)connections	2015-09-18 22:11:27 -07:00
ts6.py	TS6SIDGenerator: take an IRC object, and skip any SIDs that are currently in use	2015-09-20 18:32:43 -07:00
unreal.py	Merge branch 'master' into wip/unrealircd	2015-09-23 18:59:17 -07:00