f659595 Merge branch 'master' of ssh://pkgs.fedoraproject.org/java-1.7.0-openjdk

Merged and Committed by Jiri Vanek 11 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/java-1.7.0-openjdk
    
    Conflicts:
    	java-1.7.0-openjdk.spec
    
        
file modified
+31 -9