630436 Merge branch 'master' into f20

Merged and Committed by Stanislav Ochotnicky 6 years ago
    Merge branch 'master' into f20
    
    Conflicts:
    	javapackages-tools.spec
    
        
file modified
+13 -0
file modified
+105 -8
file modified
+1 -1