9f82e7b Merge branch 'master' of ssh://git.fedorahosted.org/git/supybot-fedora

Merged and Committed by Ricky Zhou 17 years ago
1 file changed. 10 lines added. 22 lines removed.
    Merge branch 'master' of ssh://git.fedorahosted.org/git/supybot-fedora
    
    Conflicts:
    
    	plugin.py
    
        
file modified
+10 -22