938e19 Merge remote-tracking branch 'origin/master' into f22

Merged and Committed by Jaroslav Škarvada 8 years ago
    Merge remote-tracking branch 'origin/master' into f22
    
    Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
    
    Conflicts:
    	acpid.spec
    
        
file modified
+1 -0
file modified
+16 -2