0113ce2 Merge branch 'f22'

Merged and Committed by Timothy St. Clair 9 years ago
    Merge branch 'f22'
    
    Conflicts:
    	mesos.spec
    
        
file modified
+1 -0
file modified
+2 -2
file modified
+7 -4
file modified
+1 -1