1a34689 Merge branch 'f21' of ssh://pkgs.fedoraproject.org/java-1.8.0-openjdk into f21

Merged and Committed by jvanek 9 years ago
    Merge branch 'f21' of ssh://pkgs.fedoraproject.org/java-1.8.0-openjdk into f21
    
    Conflicts:
    	java-1.8.0-openjdk.spec
    
        
file modified
+5 -2