9177f13 Merge branch 'f20' into f21

Merged and Committed by Timothy St. Clair 9 years ago
1 file changed. 13 lines added. 5 lines removed.
    Merge branch 'f20' into f21
    
    Conflicts:
    	mesos.spec
    
        
file modified
+13 -5