27c49e7 Merge branch 'master' of ssh://pkgs.fedoraproject.org/ghc-language-javascript

Merged and Committed by Ricky Elrod 10 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/ghc-language-javascript
    
    Conflicts:
    	ghc-language-javascript.spec
    
        
file modified
+3 -0