9e5fbd4 Merge branch 'master' into f22

Merged and Committed by miminar 8 years ago
    Merge branch 'master' into f22
    
    Signed-off-by: Michal Minář <miminar@redhat.com>
    
        
file modified
+1 -1
file modified
+4 -1
file modified
+1 -1