221b066 Merge branch 'master' into f23

Merged and Committed by phracek 8 years ago
    Merge branch 'master' into f23
    
    Signed-off-by: Petr Hracek <phracek@redhat.com>
    
        
file modified
+2 -0
file modified
+5 -5
file modified
+6 -4
file modified
+1 -1