Valentin Lorentz 990b911c06 Merge remote-tracking branch 'supybot/master' into testing
Conflicts:
	src/callbacks.py
	src/ircdb.py
2013-09-22 20:16:20 +02:00
..
2013-08-10 15:25:40 +02:00
2011-11-13 15:26:19 -05:00
2012-08-05 10:22:15 +02:00