4d477e0 Merge branch 'master' of ssh://pkgs.fedoraproject.org/rubygem-sinatra

1 file Merged by Michal Fojtik 13 years ago, Committed by Michal fojtik 13 years ago,
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/rubygem-sinatra
    
    Conflicts:
    	rubygem-sinatra.spec
    
        
file modified
+4 -1