a9fa858 Merge remote branch 'origin/master' into epel7

Merged and Committed by robert 4 years ago
    Merge remote branch 'origin/master' into epel7
    
    Conflicts:
    	.gitignore
    	multitail.spec
    	sources
    
        
file removed
-0
file modified
+1 -1
file removed
-21
file modified
+56 -30
file modified
+1 -1