James Lu 8969cfb74e Merge branch 'master' into devel ...

Conflicts:
	plugins/networks.py

2016-06-22 19:10:59 -07:00

..

hybrid.py

New import paths for properly installed pylinkirc

2016-06-20 18:18:54 -07:00

inspircd.py

New import paths for properly installed pylinkirc

2016-06-20 18:18:54 -07:00

nefarious.py

New import paths for properly installed pylinkirc

2016-06-20 18:18:54 -07:00

ts6_common.py

New import paths for properly installed pylinkirc

2016-06-20 18:18:54 -07:00

ts6.py

Merge branch 'master' into devel

2016-06-22 19:10:59 -07:00

unreal.py

unreal: fix typo in comment

2016-06-21 17:03:23 -07:00