081f315 Merge branch 'master' into epel7

Merged and Committed by Orion Poplawski 7 years ago
    Merge branch 'master' into epel7
    
    Conflicts:
    	libserf.spec
    	sources
    
        
file added
+125
file added
+1