a902b7d Merge branch 'master' of ssh://pkgs.fedoraproject.org/irclog2html

Merged and Committed by fab 11 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/irclog2html
    
    Conflicts:
    	irclog2html.spec
    
        
file modified
+3 -0