393184c Merge branch 'f20'

Merged and Committed by Timothy St. Clair 10 years ago
    Merge branch 'f20'
    
    Conflicts:
    	amplab-tachyon.spec
    	sources
    
        
file modified
+20 -11
file modified
+1 -1
file modified
+2 -2
file modified
+4 -4