9f6e1e9 Merge branch 'master' into f21

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