8dda5ec Merge branch 'master' of ssh://pkgs.fedoraproject.org/antlr-maven-plugin

Merged and Committed by spot 13 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/antlr-maven-plugin
    
    Conflicts:
    	antlr-maven-plugin.spec
    
        
file modified
+4 -0