Valentin Lorentz
		
	
	
		3dba9088b0
		
	
	
	
	Merge remote-tracking branch 'supybot/master' into testing
		
			
			Conflicts:
	INSTALL
	plugins/ChannelLogger/README.txt
	plugins/ChannelStats/README.txt
	plugins/Google/plugin.py
	plugins/Google/test.py
	plugins/Plugin/test.py
	plugins/Web/test.py
	setup.py
	src/callbacks.py
	src/ircdb.py
	src/irclib.py
	src/utils/str.py
	test/test_irclib.py
		
	
 
		2013-01-01 21:11:24 +01:00
	 
	
	
		 ..
	
	
	
		
			
			
			
			
			
			2012-09-01 10:16:48 -04:00
		 
	
		
			
			
			
			
			
			2010-08-24 18:24:52 -04:00
		 
	
		
			
			
			
			
			
			2010-08-24 18:24:52 -04:00
		 
	
		
			
			
			
			
			
			2010-08-24 18:24:52 -04:00
		 
	
		
			
			
			
			
			
			2013-01-01 21:11:24 +01:00
		 
	
		
			
			
			
			
			
			2010-08-24 18:24:52 -04:00
		 
	
		
			
			
			
			
			
			2012-10-19 19:09:30 +00:00
		 
	
		
			
			
			
			
			
			2010-08-24 18:24:52 -04:00
		 
	
		
			
			
			
			
			
			2010-08-24 18:24:52 -04:00
		 
	
		
			
			
			
			
			
			2010-08-24 18:24:52 -04:00
		 
	
		
			
			
			
			
			
			2012-09-01 10:06:50 -04:00
		 
	
		
			
			
			
			
			
			2010-08-24 18:24:52 -04:00
		 
	
		
			
			
			
			
			
			2010-08-24 18:24:52 -04:00
		 
	
		
			
			
			
			
			
			2010-08-24 18:24:52 -04:00