91cf4ab Merge branch 'f20' into f21

Merged and Committed by Timothy St. Clair 9 years ago
    Merge branch 'f20' into f21
    
    Conflicts:
    	mesos.spec
    
        
file modified
+13 -0
file modified
+1 -0
file modified
+5 -3
file modified
+29 -11