20fa1e5 Merge branch 'master' into el6

Merged and Committed by Patrick Uiterwijk 11 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	sources
    	supybot-fedora.spec
    
        
file modified
+2 -1
file modified
+1 -1
file modified
+28 -3