df82222 Merge branch 'el6'

Merged and Committed by Rex Dieter 9 years ago
    Merge branch 'el6'
    
    Conflicts:
    	qt5-qtxmlpatterns.spec
    
        
file modified
+1 -3
file modified
+8 -0
file modified
+1 -1