e004ae7 Merge remote-tracking branch 'origin/master' into f22

Merged and Committed by jwrdegoede 9 years ago
    Merge remote-tracking branch 'origin/master' into f22
    
    Conflicts:
    	xorg-x11-drv-armsoc.spec
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+8 -3