James Lu 6476aefb5f Merge branch 'master' into devel ... Conflicts: protocols/inspircd.py		2015-09-14 16:55:35 -07:00
..
inspircd.py	Merge branch 'master' into devel	2015-09-14 16:55:35 -07:00
ts6_common.py	ts6_common: make old topic retrievable in handle_topic	2015-09-13 14:23:09 -07:00
ts6.py	protocols: return an "oldchan" IrcChannel object with the previous state of a channel when processing channel mode changes	2015-09-13 13:47:18 -07:00