f2d8163 Merge branch 'master' into epel7

Merged and Committed by Jan-Frode Myklebust 10 years ago
    Merge branch 'master' into epel7
    
    Conflicts:
    	trafficserver.spec
    
        
file modified
+5 -0
file modified
+2 -1
file added
+0
empty file added
file modified
+103 -19