James McCoy 8b73f78b3e Merge branch 'maint/0.83.4'
Conflicts:
	plugins/Misc/plugin.py
	src/ircutils.py

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
2011-11-13 15:26:19 -05:00
..
2011-10-22 16:06:37 -04:00
2011-10-23 20:33:41 -04:00
2009-08-26 16:34:12 -04:00
2011-10-23 19:41:54 -04:00
2010-09-08 22:20:23 -04:00
2011-10-23 19:29:52 -04:00
2011-11-13 15:26:19 -05:00
2009-11-04 22:54:46 -05:00
2011-10-22 15:52:44 -04:00
2009-08-26 16:34:12 -04:00
2011-10-23 19:04:12 -04:00
2011-11-13 15:26:19 -05:00
2011-11-13 15:26:19 -05:00
2011-11-13 15:26:19 -05:00
2011-10-23 19:41:54 -04:00
2010-09-20 19:46:18 -04:00